projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b1b57e 702b691)
Merge commit '702b691e4a71' into next/dt
authorOlof Johansson <olof@lixom.net>
Thu, 22 May 2014 05:41:50 +0000 (22:41 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 22 May 2014 05:41:50 +0000 (22:41 -0700)
Merging in Samsung fixes for 3.15-rc to avoid an annoying context conflict
with new DT code.

* commit '702b691e4a71':
  ARM: dts: Remove g2d_pd node for exynos5420
  ARM: dts: Remove mau_pd node for exynos5420
  ARM: exynos_defconfig: enable HS-I2C to fix for mmc partition mount
  ARM: dts: disable MDMA1 node for exynos5420
  ARM: EXYNOS: fix the secondary CPU boot of exynos4212

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

Trivial merge