Skip to content
Commit 7266d48f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'timer/cleanup' into late/mvebu2 



Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 168268a2 90cf214d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment