tree dbc2364c164db3743bd86ff02557369daac0fac4
parent 91444f47b2a0e50a15849f49db8c15382cd8de1b
parent bbe7b8bef48c567f5ff3f6041c1fb011292e8f12
author Linus Torvalds <torvalds@linux-foundation.org> 1305923908 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305923908 -0700

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/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