Merge branch 'l7200' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Jul 2010 10:08:33 +0000 (11:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Jul 2010 10:08:33 +0000 (11:08 +0100)
Conflicts:
arch/arm/configs/lusl7200_defconfig

1  2 
arch/arm/Kconfig

Simple merge