tree 57d23b51502649499784fcf3741091f40b366bda
parent 0aa2ca9ae1e08d11661abb00ae6e75ff885448d6
parent b9c3032277f756e73f6c673419dc414155e04e46
author Linus Torvalds <torvalds@linux-foundation.org> 1266292332 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266292332 -0800

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:
  hrtimer, softirq: Fix hrtimer->softirq trampoline