Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:52:12 +0000 (19:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:52:12 +0000 (19:52 -0800)
commit7d0bab9dfecb3717f7e704b60a9f11631cb6636e
tree57d23b51502649499784fcf3741091f40b366bda
parent0aa2ca9ae1e08d11661abb00ae6e75ff885448d6
parentb9c3032277f756e73f6c673419dc414155e04e46
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:
  hrtimer, softirq: Fix hrtimer->softirq trampoline