Merge branch 'samsung/cleanup-plat-s5p' into next/soc2
authorArnd Bergmann <arnd@arndb.de>
Wed, 16 May 2012 13:53:15 +0000 (15:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 16 May 2012 13:53:15 +0000 (15:53 +0200)
commita551204badbea5119a84ee4f03faefce9f2c0543
tree8592f756c984f376be13cf839c4815ff8a7266a6
parent26625ddadbe9cd5791c9d64b0425821b036c5188
parent199642bfe107c411f25fbfc16c9fd49cfef9785d
Merge branch 'samsung/cleanup-plat-s5p' into next/soc2
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/plat-samsung/Kconfig