Merge tag 'socfpga_dts_for_v4.5_part_2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 21:18:44 +0000 (13:18 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 21:18:44 +0000 (13:18 -0800)
commitab7f0bbba4fa173f901f04556cd885f5a81990bf
tree6d3f1e5c98cdb2fcb35b16253a3d91c703af76d5
parent84658cbde8e3a7ef36f75a12929d49fedc0eff8c
parent91f69147d681e47e2aa2ff7dbf4c5468befa8a1b
Merge tag 'socfpga_dts_for_v4.5_part_2' of git://git./linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS update for v4.5, part 2
- clean up mcvevk dts file, replace space with tab
- Disable SDMMC node in base socfpga.dtsi file

* tag 'socfpga_dts_for_v4.5_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: Enable MMC support at correct place in the DT
  ARM: socfpga: Repair incorrectly applied MCV patch

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