diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-21 22:41:50 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-21 22:41:50 -0700 |
| commit | 89f6dfacebccf1666253ad1487585e6b234b9531 (patch) | |
| tree | 0b0f62b5e726a59e5888bb53ff8e7f2a90378a98 /arch/arm/mach-exynos/exynos.c | |
| parent | 8b1b57e88e1fa427c01679eaa992bd191b1dfb06 (diff) | |
| parent | 702b691e4a711e699cf3cccba879c1d945665c0d (diff) | |
Merge commit '702b691e4a71' into next/dt
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>
Diffstat (limited to 'arch/arm/mach-exynos/exynos.c')
0 files changed, 0 insertions, 0 deletions