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

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 <olof@lixom.net>