From: Olof Johansson Date: Thu, 11 Apr 2013 10:48:25 +0000 (-0700) Subject: Merge tag 'sunxi-dt-for-3.10-3' of git://github.com/mripard/linux into next/dt X-Git-Tag: v3.10-rc1~124^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=768cc7675dc9b10f08d369b3a282a58f7020061c;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge tag 'sunxi-dt-for-3.10-3' of git://github.com/mripard/linux into next/dt From Maxime Ripard: SunXi dt additions for 3.10, take 3 - Remove sunxi.dtsi and only use one dtsi for each SoC - Various compatible renamings to be consistent with the other platforms * tag 'sunxi-dt-for-3.10-3' of git://github.com/mripard/linux: ARM: sunxi: dt: Update watchdog compatible string ARM: sunxi: dt: Update interrupt controller compatible string ARM: sunxi: dt: Update timer compatible string ARM: sunxi: dt: Reorganize the dtsi Signed-off-by: Olof Johansson --- 768cc7675dc9b10f08d369b3a282a58f7020061c