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>