Merge branch 'origin' into misc
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Jul 2010 09:42:48 +0000 (10:42 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Jul 2010 09:42:52 +0000 (10:42 +0100)
commit4708ac49305bbcd511600d4af71a4c6dca15af65
tree77ba5c83a7d4f4a119e3fd524d82adc297df1e35
parent1dbd30e9890fd69e50b17edd70ca583546b0fe4e
parent2f7989efd4398d92b8adffce2e07dd043a0895fe
Merge branch 'origin' into misc
arch/arm/Kconfig
arch/arm/kernel/entry-armv.S
arch/arm/mm/Kconfig