Merge commit '702b691e4a' into next/dt

Merging in Samsung fixes for 3.15-rc to avoid an annoying context conflict
with new DT code.

* commit '702b691e4a':
  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>
This commit is contained in:
Olof Johansson 2014-05-21 22:41:50 -07:00
commit 89f6dfaceb
4 changed files with 22 additions and 24 deletions