tree 281401f6a868b888e30465eac233e084ed6d8bb3
parent 41739b60b3c00e0591d1a413276ddfa0d0b1ea89
parent 67bea88dd842deb3ed8327ad101970dbd615ddcb
author Olof Johansson <olof@lixom.net> 1353523925 -0800
committer Olof Johansson <olof@lixom.net> 1353523964 -0800

Merge branch 'sunxi/soc2' into next/soc

From Maxime Ripard:

Here is a pull request to add the support for Allwinner A10 SoCs.

* sunxi/soc2:
  ARM: sunxi: Add sunxi restart function via onchip watchdog
  ARM: sunxi: Add sun4i and cubieboard support
  ARM: sunxi: Add earlyprintk support for UART0 (sun4i)
  ARM: sunxi: Restructure sunxi dts/dtsi files

Signed-off-by: Olof Johansson <olof@lixom.net>