Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Aug 2008 18:26:56 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Aug 2008 18:26:56 +0000 (11:26 -0700)
commit426e1eafdbd1d1349c852a2b90c7f20879d52ed2
tree2c3043d8eef1bf34bf75ce002b380fcf6c5ce380
parentec73adba51b4dae11134f7e6ffc84feade9f15fa
parent38c052f8cff1bd323ccfa968136a9556652ee420
Merge branch 'timers-fixes-for-linus' of git://git./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: fix deadlock