From: Olof Johansson <olof@lixom.net>
Date: Tue, 8 Jan 2013 18:51:01 +0000 (-0800)
Subject: Merge branch 'timer/cleanup' into next/cleanup
X-Git-Tag: firefly_0821_release~3680^2~1075^2~31
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd41d91df99be02f4fc3fe79d707d2786d6e40eb;p=firefly-linux-kernel-4.4.55.git

Merge branch 'timer/cleanup' into next/cleanup

Adding a manually applied bugfix for sunxi.

* timer/cleanup:
  ARM: sunxi: fix struct sys_timer removal

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

fd41d91df99be02f4fc3fe79d707d2786d6e40eb