Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 17:34:47 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 17:34:47 +0000 (10:34 -0700)
commit9d0715630ebf7bf70daa5e6d8db0e3061268c61e
tree54562185002b22169d81e0fb3c21312cb510ac40
parentc0c463d34adf0c150e5e24fa412fa23f3f7ddc27
parent06c3df49521c1b112b777cc4946e5de057c814ba
Merge branch 'timers-clocksource-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: apb: Share APB timer code with other platforms
arch/x86/Kconfig
arch/x86/include/asm/apb_timer.h
arch/x86/kernel/apb_timer.c
drivers/clocksource/Kconfig
drivers/clocksource/Makefile