From: Olof Johansson <olof@lixom.net>
Date: Thu, 11 Apr 2013 10:39:00 +0000 (-0700)
Subject: Merge tag 'sunxi-cleanup-for-3.10' of git://github.com/mripard/linux into next/cleanup
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~70^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9d5868e342a9802db7b299be511ac547ff1034d;p=pandora-kernel.git

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.
---

b9d5868e342a9802db7b299be511ac547ff1034d
Reading git-diff-tree failed