tree c3d7b3f1441bd900e3c8e22e1c37eed954c2fd41
parent f19814721e24cac152348872ff38f38a3b45852a
parent 4923ee444a39c8b75027ed01a7812e940194dbec
author Olof Johansson <olof@lixom.net> 1367001359 -0700
committer Olof Johansson <olof@lixom.net> 1367001359 -0700

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>