Merge tag 'sunxi-cleanup-for-3.10' of git://github.com/mripard/linux into next/cleanup
authorOlof Johansson <olof@lixom.net>
Thu, 11 Apr 2013 10:39:00 +0000 (03:39 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 11 Apr 2013 10:39:00 +0000 (03:39 -0700)
commitb9d5868e342a9802db7b299be511ac547ff1034d
tree49c8fe5467b817bcaf2afa6468c2e362f50e4770
parent83c15f4c05757b3c5fe1551a474458fd16d27bae
parentbc34b5f27cd33f4213bc5c8df0099dd11408d29d
Merge tag 'sunxi-cleanup-for-3.10' of git://github.com/mripard/linux into next/cleanup

From Maxime Ripard:
Cleanups for Allwinner sunXi architecture:
  - Remove sunxi.dtsi
  - Switch to clocksource/irqchip device tree handlers
  - Cleanup the watchdog code

* tag 'sunxi-cleanup-for-3.10' of git://github.com/mripard/linux:
  ARM: sunxi: Rework the restart code
  irqchip: sunxi: Rename sunxi to sun4i
  irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
  clocksource: sunxi: Rename sunxi to sun4i
  clocksource: sunxi: make use of CLKSRC_OF
  clocksource: sunxi: Cleanup the timer code
  clocksource: make CLOCKSOURCE_OF_DECLARE type safe

Signed-off-by: Olof Johansson <olof@lixom.net>
Add/change conflict in drivers/clocksource/Makefile resolved.
drivers/clocksource/Makefile
drivers/irqchip/Makefile