Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 20:38:28 +0000 (13:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 20:38:28 +0000 (13:38 -0700)
commit102dc1bae12a20214c9ee2d33a7402dc5175e30d
treedbc2364c164db3743bd86ff02557369daac0fac4
parent91444f47b2a0e50a15849f49db8c15382cd8de1b
parentbbe7b8bef48c567f5ff3f6041c1fb011292e8f12
Merge branch 'timers-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  MAINTAINERS: Add drivers/clocksource to TIMEKEEPING
  clockevents/source: Use u64 to make 32bit happy
MAINTAINERS