diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:38 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:38 +0200 |
| commit | 05c9ca8843cdf688275df891d512e204359717c5 (patch) | |
| tree | 9d9139d62a818ab8d59744fb1211612053d29f98 /arch/arm/mach-mmp/clock-pxa910.c | |
| parent | Merge branch 'sa1100' into for-next (diff) | |
| parent | ARM: replace BSYM() with badr assembly macro (diff) | |
| download | linux-05c9ca8843cdf688275df891d512e204359717c5.tar.xz linux-05c9ca8843cdf688275df891d512e204359717c5.zip | |
Merge branch 'bsym' into for-next
Conflicts:
arch/arm/kernel/head.S
Diffstat (limited to 'arch/arm/mach-mmp/clock-pxa910.c')
0 files changed, 0 insertions, 0 deletions