tree 78aa6de9e9495c39f8671aed927fece5adff8d24
parent cfa97f993c275d193fe82c22511dfb5f1e51b661
parent 82c5b7b527ccc4b5d3cf832437e842f9d2920a79
author Linus Torvalds <torvalds@linux-foundation.org> 1231290653 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231290653 -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: splitout peek ahead functionality, fix
  hrtimer: fixup comments
  hrtimer: fix recursion deadlock by re-introducing the softirq
  hrtimer: simplify hotplug migration
  hrtimer: fix HOTPLUG_CPU=n compile warning
  hrtimer: splitout peek ahead functionality