Merge tag 'sunxi-dt-for-3.11-2' of git://github.com/mripard/linux into next/dt

From Maxime Ripard:

Allwinner SoCs DT additions for 3.11, part 2

Mostly adds support for the i2c controllers and the Allwinner A10S SoC.

* tag 'sunxi-dt-for-3.11-2' of git://github.com/mripard/linux:
  ARM: sunxi: Add Olimex A10s-Olinuxino-micro device tree
  ARM: sunxi: dt: Add Allwinner A10s DTSI
  ARM: sun4i: cubieboard: Enable the i2c controllers
  ARM: sun5i: olinuxino: Enable the i2c controllers
  ARM: sun5i: dt: Add i2c muxing options
  ARM: sun4i: dt: Add i2c muxing options
  ARM: sunxi: dt: Add i2c controller nodes to the DTSI

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/boot/dts/Makefile
index a778bc0,9d6e5a4..242a493
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -191,10 -177,9 +191,11 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-
        spear320-evb.dtb \
        spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 -dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \
 +dtb-$(CONFIG_ARCH_SUNXI) += \
 +      sun4i-a10-cubieboard.dtb \
 +      sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
+       sun5i-a10s-olinuxino-micro.dtb \
        sun5i-a13-olinuxino.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \

diff --cc arch/arm/boot/dts/sun4i-a10.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sun5i-a13.dtsi
Simple merge