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)
commite910b63d009701ad4ebbeb089aba35707fa5d68e
treef7fdd3c2b1d9165d69a778c434e664f8789f4401
parent2f7989efd4398d92b8adffce2e07dd043a0895fe
parentc9c6fe5033191d82e1d819105485c795062107fd
Merge branch 'l7200' into devel

Conflicts:
arch/arm/configs/lusl7200_defconfig
arch/arm/Kconfig