From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Apr 2011 22:08:31 +0000 (-0700)
Subject: Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.39-rc6~18
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fcc4dc715113999c6c7b5d3087fade3ee8d0f6eb;p=~shefty%2Frdma-dev.git

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

fcc4dc715113999c6c7b5d3087fade3ee8d0f6eb