]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 11 Sep 2011 09:36:47 +0000 (10:36 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 11 Sep 2011 09:36:47 +0000 (10:36 +0100)
commit6d86b2fc7ca2e954860566b69e5f31fe7b424ed2
treee3d6b8409d5a211ea1adf7ba8329ecf50a964e8d
parente81a5597570deb83c9aefeb46ea8f933409ced92
parentf21bdf753bbc6a46c0d6e2ca56fbf1d99630b5f6
Merge branch 'misc' into for-next

Conflicts:
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/Kconfig
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/kernel/Makefile
arch/arm/mach-mmp/aspenite.c
arch/arm/mach-sa1100/Makefile
arch/arm/mm/cache-l2x0.c