diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:09:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:09:22 -0500 |
| commit | bc85e585c6d0fab4bde12d60964b2f25802c3163 (patch) | |
| tree | 80f5fe916e3458d0676e595e3433a0313e7ba72b /arch/arm/mach-sa1100/include/mach/hardware.h | |
| parent | 186f93ea1f274f4cde4a356401c1786c818ff881 (diff) | |
| parent | 796d12959ad374cae8eb77faaf4243455a305433 (diff) | |
Merge branch 'perf' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/hardware.h')
0 files changed, 0 insertions, 0 deletions