Merge branch 'samsung/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 20:15:55 +0000 (22:15 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 20:15:55 +0000 (22:15 +0200)
commitda1c5afee092a2b51136ac3bf20c68bfff2924be
treefa71b9e3af25c870012a22e4cb72547f9aafcfd0
parent1fdb4888e45f1413972a8e9da55f3ffc08b9abcb
parent4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a
Merge branch 'samsung/cleanup' into next/cleanup
arch/arm/Kconfig
arch/arm/mach-imx/mach-cpuimx35.c