| commit | 426e1eafdbd1d1349c852a2b90c7f20879d52ed2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 25 11:26:56 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 25 11:26:56 2008 -0700 |
| tree | 2c3043d8eef1bf34bf75ce002b380fcf6c5ce380 | |
| parent | ec73adba51b4dae11134f7e6ffc84feade9f15fa [diff] | |
| parent | 38c052f8cff1bd323ccfa968136a9556652ee420 [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: fix deadlock