From: Olof Johansson Date: Thu, 2 Jan 2014 20:05:13 +0000 (-0800) Subject: Merge tag 'sunxi-dt-for-3.14' of https://github.com/mripard/linux into next/dt X-Git-Tag: v3.14-rc1~36^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c53cb8d6a2cbcf9d85f5129e9efd4a0275f89d03;p=kernel%2Fkernel-generic.git Merge tag 'sunxi-dt-for-3.14' of https://github.com/mripard/linux into next/dt From Maxime Ripard: Allwinner sunXi DT Additions for 3.14 Various DT related patches, but mostly: - Support for the Olimex A13-olinuxino-micro - Added the needed IP in the A31 for the HS timer support and SMP bringup - A10 and A20 RTC * tag 'sunxi-dt-for-3.14' of https://github.com/mripard/linux: ARM: sun6i: dt: Add IP needed to bring up the additional cores ARM: dts: sun5i: Add new sun5i-a13-olinuxino-micro board ARM: sun6i: Add the reset controller to the DTSI ARM: sunxi: dt: add EMAC aliases ARM: dts: sun4i/sun7i: add RTC node Signed-off-by: Olof Johansson --- c53cb8d6a2cbcf9d85f5129e9efd4a0275f89d03