]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41739b6 67bea88)
Merge branch 'sunxi/soc2' into next/soc
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 18:52:05 +0000 (10:52 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 18:52:44 +0000 (10:52 -0800)
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>
1  2 
arch/arm/Kconfig.debug patch | diff1 | diff2 | blob | history
arch/arm/boot/dts/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig.debug
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.