git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37746c9 4923ee4)
Merge branch 'samsung/exynos-multiplatform' into next/drivers
authorOlof Johansson <olof@lixom.net>
Fri, 26 Apr 2013 18:47:45 +0000 (11:47 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 26 Apr 2013 18:47:45 +0000 (11:47 -0700)
This merges in the revert of multiplatform support for exynos.

Trivial conflicts on removed code. Also, needed to add "select COMMON_CLK"
to the non-multiplatform EXYNOS config option.

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

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge
Pandora Kernel Repository