From: Arnd Bergmann Date: Fri, 19 Apr 2013 11:35:57 +0000 (+0200) Subject: Merge branch 'samsung/exynos-multiplatform' into next/multiplatform X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~67^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56b690481c4baed815b9e4acf5ea89eadb58ba17;p=pandora-kernel.git Merge branch 'samsung/exynos-multiplatform' into next/multiplatform These patches get us closer to adding multiplatform support on the Exynos platform, they are part of a longer series of patches. This would get all the simple stuff out of the way, and I don't think there is a big risk of introducing regressions with these. A lot of the other patches have already been merged into subsystem trees. After this series in in arm-soc, what is left comes down to * The ASoC conversion to dmaengine won't make it unless someone who knows that code better steps up to do it right away. This means that we won't have audio in a 3.10 multiplatform kernel on Exynos, but it will still work for users that don't enable multiplatform. * The irqchip (combiner), clk and clksource patches are all based on top of other changesets we pulled in from your trees, so I would not make them part of the next/multiplatform branch. We can apply them on top of the next/drivers branch once they are tested successfully. * A trivial patch is needed in the end to actually make CONFIG_ARCH_EXYNOS visible in multiplatform configurations. We will do that as a separate patch once everything else is there. Signed-off-by: Arnd Bergmann --- 56b690481c4baed815b9e4acf5ea89eadb58ba17 Reading git-diff-tree failed