Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 4 Feb 2012 10:32:18 +0000 (10:32 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 4 Feb 2012 10:32:18 +0000 (10:32 +0000)
1  2 
arch/arm/Kconfig
arch/arm/kernel/time.c

Simple merge
Simple merge