]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit59a1de76146e1d3c1f4974d5a052e6f8a60115f5
tree54562185002b22169d81e0fb3c21312cb510ac40
parent9e2d108397a10a1ad4e6699ba79ae9b529008d8d
parentdde31772c3ce15a53161ff7075816c81678d921c
Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/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