Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git...
commit0355e2ff4466fa0bddee64e3cdc2ba687372f4e2
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 4 Feb 2012 10:32:18 +0000 (4 10:32 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 4 Feb 2012 10:32:18 +0000 (4 10:32 +0000)
tree88327966a39ee99d9ee11f836c45972a6d277cf6
parentbea15fd77ffa1338c293328b8c74a120be53e861
parent6905a65879b51d326396e63dfea40861a30bc17f
Merge branch 'sched_clock-for-rmk' of git://git./linux/kernel/git/maz/arm-platforms into devel-stable
arch/arm/Kconfig
arch/arm/kernel/time.c