Merge branch 'samsung/cleanup' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 00:18:10 +0000 (00:18 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 00:18:10 +0000 (00:18 +0000)
commitbd4b9ba4cf9338932a065cd752fb5f28b26e4e39
tree88725708d3f2696f1c2373cf62d0b997c207e861
parente814fb635cd269532a6a95a921c05841ababa7ae
parent8a44930a11de8d66f92145fd2d2464ab4fba696b
Merge branch 'samsung/cleanup' into next/drivers

Dependency for the samsung/drivers branch

Conflicts:
arch/arm/mach-exynos/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Makefile
arch/arm/plat-samsung/include/plat/devs.h