Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Mar 2012 08:51:13 +0000 (08:51 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Mar 2012 08:51:13 +0000 (08:51 +0000)

Trivial merge