tree 6f63a64c2811135e6edca885f5a2c79f50ba7465
parent 4187e7e9f1294afdcb3be5d00aa74412a1c2ded8
parent 89133f93508137231251543d1732da638e6022e1
author Linus Torvalds <torvalds@linux-foundation.org> 1253985281 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253985281 -0700

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:
  clocksource: Resume clocksource without taking the clocksource mutex