summaryrefslogtreecommitdiff
path: root/arch/arm/mach-gemini
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-17 02:35:26 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-17 02:35:26 +0300
commitbd1274dc005c2cee41771a7cc616f4709a6e6323 (patch)
treefcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca /arch/arm/mach-gemini
parent1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (diff)
parent3ba6e69ad887f8a814267ed36fd4bfbddf8855a9 (diff)
downloadlinux-bd1274dc005c2cee41771a7cc616f4709a6e6323.tar.xz
Merge branch 'v6v7' into devel
Conflicts: arch/arm/include/asm/cacheflush.h arch/arm/include/asm/proc-fns.h arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-gemini')
0 files changed, 0 insertions, 0 deletions