Skip to content
Commit 340fcb5c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'samsung/exynos-multiplatform' into next/drivers



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: default avatarOlof Johansson <olof@lixom.net>
parents 37746c9a 4923ee44
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment