Merge tag 'sunxi-core-for-3.11' of git://github.com/mripard/linux into next/cleanup

From Maxime Ripard:
Allwinner SoCs platform additions for 3.11
  - Various cleanups and documentation updates

* tag 'sunxi-core-for-3.11' of git://github.com/mripard/linux:
  ARM: sunxi: irqchip: Update the documentation
  ARM: sunxi: Update datasheet documentation
  ARM: sunxi: Remove init_irq declaration in machine description

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

diff --cc arch/arm/mach-sunxi/sunxi.c
index d1b5bc5,08937a3..a3a755f
--- 1/arch/arm/mach-sunxi/sunxi.c
--- 2/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@@ -100,7 -115,7 +99,6 @@@ static const char * const sunxi_board_d
  
  DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
        .init_machine   = sunxi_dt_init,
-       .init_irq       = irqchip_init,
 -      .map_io         = sunxi_map_io,
        .init_time      = sunxi_timer_init,
        .dt_compat      = sunxi_board_dt_compat,
  MACHINE_END