| commit | 05c9ca8843cdf688275df891d512e204359717c5 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Jun 12 21:18:38 2015 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Jun 12 21:18:38 2015 +0100 |
| tree | 9d9139d62a818ab8d59744fb1211612053d29f98 | |
| parent | c62af70ff3015a4412c6655de602fdf7f1ecdaa6 [diff] | |
| parent | 14327c662822e5e874cb971a7162067519300ca8 [diff] |
Merge branch 'bsym' into for-next Conflicts: arch/arm/kernel/head.S