Merge tag 'tags/sunxi-support-for-3.8' of git://github.com/mripard/linux into next/soc
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 06:14:59 +0000 (22:14 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 06:14:59 +0000 (22:14 -0800)
From Maxime Ripard:
Allwinner SoC support for 3.8

* tag 'tags/sunxi-support-for-3.8' of git://github.com/mripard/linux:
  ARM: sunxi: Add entry to MAINTAINERS
  ARM: sunxi: Add device tree for the A13 and the Olinuxino board
  ARM: sunxi: Add earlyprintk support
  ARM: sunxi: Add basic support for Allwinner A1x SoCs
  irqchip: sunxi: Add irq controller driver
  clocksource: sunxi: Add Allwinner A1X Timer Driver
  clk: sunxi: Add dummy fixed rate clock for Allwinner A1X SoCs

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/Makefile
arch/arm/boot/dts/Makefile
drivers/irqchip/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,2 -1,2 +1,3 @@@
  obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
+ obj-$(CONFIG_ARCH_SUNXI)   += irq-sunxi.o
 +obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o