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)
Adding a manually applied bugfix for sunxi.

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

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/mach-sunxi/sunxi.c

Simple merge