Merge branch 'timer/cleanup' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Tue, 8 Jan 2013 18:51:01 +0000 (10:51 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 8 Jan 2013 18:51:19 +0000 (10:51 -0800)
commitfd41d91df99be02f4fc3fe79d707d2786d6e40eb
tree10fdd9626f5085e9b2c22204aea949a6bc0d8bba
parent981302783e891482d767ce90b04ed37159d2ebf8
parent1c2584c3a1c882fec729147a46d822522552e38c
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>
arch/arm/mach-sunxi/sunxi.c