From: Olof Johansson Date: Mon, 28 Oct 2013 04:14:40 +0000 (-0700) Subject: Merge tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux into next/dt X-Git-Tag: v3.13-rc1~156^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c90d19be2716aa677d2941828d802f4cfbecab80;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux into next/dt From Maxime Ripard: Allwinner sunXi SoCs device tree changes for 3.13 This DT series sees the introduction of the cubietruck DT, plus the addition of the i2c controller for the A20 based boards, and of the Security ID found in all the Allwinner SoCs but the A31. * tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux: ARM: sunxi: dts: Add support for the cubieboard3, the CubieTruck ARM: sun7i: olinuxino-micro: Enable the I2C controllers ARM: sun7i: cubieboard2: Enable the I2C controllers ARM: sun7i: Add the pin muxing options for the I2C controllers ARM: sun7i: Enable the I2C controllers ARM: sunxi: dt: Add sunxi-sid to dts for sun4i, sun5i and sun7i Signed-off-by: Olof Johansson --- c90d19be2716aa677d2941828d802f4cfbecab80