From: Olof Johansson Date: Fri, 26 Apr 2013 18:47:45 +0000 (-0700) Subject: Merge branch 'samsung/exynos-multiplatform' into next/drivers X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~47^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=340fcb5cb4c91e58a5102beb0b86b9c416b8c956;p=pandora-kernel.git 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: Olof Johansson --- 340fcb5cb4c91e58a5102beb0b86b9c416b8c956 Reading git-diff-tree failed