]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 26 Mar 2009 23:10:11 +0000 (23:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 26 Mar 2009 23:10:11 +0000 (23:10 +0000)
commit542f869f1826f092606efd0c4c771f070d1314f5
tree9c9d265ab0c87ea7862ccb70933f33d3d7011334
parente8b374bb6c888a70530d800c9e2fcd153e2c325d
parent839e642f3dda44a35c6a91780bff41d84c288022
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

Conflicts:
arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/head.S
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
arch/arm/mm/Makefile