Merge remote-tracking branch 'renesas/next'

diff --cc arch/arm/boot/dts/Makefile
index 9c6255884cbbd51f7efd83c5c4b6327156fc5c6c,b284b2225ae00c3cbc3a3b0f91c71540e9193201..ee9fbe4d991286087caec318f5f3a16c7fc53ca4
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -136,10 -122,10 +136,12 @@@ dtb-$(CONFIG_ARCH_U8500) += snowball.dt
        ccu9540.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        r8a7740-armadillo800eva.dtb \
+       r8a7779-marzen-reference.dtb \
        sh73a0-kzm9g.dtb \
+       sh73a0-kzm9g-reference.dtb \
        sh7372-mackerel.dtb
 +dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
 +      socfpga_vt.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
  dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc drivers/Makefile
Simple merge