Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Apr 2011 22:08:31 +0000 (15:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Apr 2011 22:08:31 +0000 (15:08 -0700)
commitfcc4dc715113999c6c7b5d3087fade3ee8d0f6eb
tree1f0aa5cc31baff8b0b392208d31b7f7ce3f02cee
parenta6ab948e6500306dcb415ec80bff5f9b93f41b90
parentce31332d3c77532d6ea97ddcb475a2b02dd358b4
Merge branch 'timer-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimer: Initialize CLOCK_ID to HRTIMER_BASE table statically
  rtc: max8925: Call dev_set_drvdata before rtc_device_register