]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorWill Deacon <will.deacon@arm.com>
Fri, 1 Feb 2013 10:17:02 +0000 (10:17 +0000)
committerWill Deacon <will.deacon@arm.com>
Fri, 1 Feb 2013 10:17:02 +0000 (10:17 +0000)

Trivial merge