Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jun 2011 14:23:59 +0000 (07:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jun 2011 14:23:59 +0000 (07:23 -0700)
commit8abf55883431a91d4877933240c8419b7fc17274
treec7de035cf068f3edf5053a30d912c2024bac88d8
parent4d362ad280fca0f2e098de607534f72f2c243e12
parentb1eb085c064d0843826d7402db7fc5f3032e01fc
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:
  rtc: vt8500: Fix build error & cleanup rtc_class_ops->update_irq_enable()
  alarmtimers: Return -ENOTSUPP if no RTC device is present
  alarmtimers: Handle late rtc module loading