]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b6390f7 d478f3f)
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Aug 2011 17:28:33 +0000 (10:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Aug 2011 17:28:33 +0000 (10:28 -0700)
commit4d2368a2fc1c311382fffe8d21b908c0205341b4
tree1a405f211c64f20359e42b3783d0487647da9822tree | snapshot
parentb6390f75deeb07a66be4613719550904890b91a1commit | diff
parentd478f3f4a793a477a8a51517593d6cdb195185c7commit | diff
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.
Linux Kernel Source Tree.