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)
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>

Trivial merge