commit 6cac95296034bed7b2716d5f4e417a26a618da94
author Linus Torvalds <torvalds@linux-foundation.org> Wed Aug 17 10:28:33 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Aug 17 10:28:33 2011 -0700
tree 1a405f211c64f20359e42b3783d0487647da9822
parent 2da9f365fc401b79627bc7be56d8a2b4ee9b390b
parent 6e7a333eaa522ef73be01caec7a01521490aaf00

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:
  rtc: Limit RTC PIE frequency
  rtc: Fix hrtimer deadlock
  rtc: Handle errors correctly in rtc_irq_set_state()

Fixup trivial conflicts in drivers/rtc/interface.c due to slightly
trivially versions of the same patch coming in two different ways.