Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Aug 2009 18:24:04 +0000 (11:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Aug 2009 18:24:04 +0000 (11:24 -0700)
commit44afa9a4b8c5773f47e6494da12ca086c9ffea34
tree0945f4dbbc785382e0d7e8607897fb360f550c52
parent7d63e6359a2e86cd6335337de99354ab07680c55
parentf833bab87fca5c3ce13778421b1365845843b976
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:
  clockevent: Prevent dead lock on clockevents_lock
  timers: Drop write permission on /proc/timer_list