Merge branch 'samsung/exynos-multiplatform' into next/multiplatform
authorOlof Johansson <olof@lixom.net>
Fri, 26 Apr 2013 18:35:59 +0000 (11:35 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 26 Apr 2013 18:35:59 +0000 (11:35 -0700)
commit772ba2ffd2033ecc4451c10b20c01814156ee1b1
treec3d7b3f1441bd900e3c8e22e1c37eed954c2fd41
parentf19814721e24cac152348872ff38f38a3b45852a
parent4923ee444a39c8b75027ed01a7812e940194dbec
Merge branch 'samsung/exynos-multiplatform' into next/multiplatform

This just merges in the revert of multiplatform support. Not doing it by
cherry-pick since we need the same revert in the next/drivers branch.

* samsung/exynos-multiplatform:
  Revert "ARM: exynos: enable multiplatform support"

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig