Merge branch 'timer/cleanup' into late/mvebu2
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Feb 2013 17:54:15 +0000 (18:54 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Feb 2013 17:54:15 +0000 (18:54 +0100)
Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge