tree 10fdd9626f5085e9b2c22204aea949a6bc0d8bba
parent 981302783e891482d767ce90b04ed37159d2ebf8
parent 1c2584c3a1c882fec729147a46d822522552e38c
author Olof Johansson <olof@lixom.net> 1357671061 -0800
committer Olof Johansson <olof@lixom.net> 1357671079 -0800

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>