]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'clksrc/cleanup' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Mar 2013 11:02:00 +0000 (12:02 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Mar 2013 11:02:00 +0000 (12:02 +0100)
commit4986718ab9f09efb7279a04938637c4446785091
treee2104c665a06f8e5f8a41f037e1c246d325f14cd
parent21aae633acbb434da333a5c9e2d63afeb504f730
parent3d5a96582303e28c48699f3faaf920ef7d43e6f2
Merge branch 'clksrc/cleanup' into for-next

Conflicts:
include/linux/clocksource.h