| commit | fcc4dc715113999c6c7b5d3087fade3ee8d0f6eb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 29 15:08:31 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 29 15:08:31 2011 -0700 |
| tree | 1f0aa5cc31baff8b0b392208d31b7f7ce3f02cee | |
| parent | a6ab948e6500306dcb415ec80bff5f9b93f41b90 [diff] | |
| parent | ce31332d3c77532d6ea97ddcb475a2b02dd358b4 [diff] |
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