From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Jan 2009 01:10:53 +0000 (-0800)
Subject: Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.29-rc1~223
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3610639d1fceb09cb418c65fcbe9136c31eee03a;p=linux-2.6-omap-h63xx.git

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
---

3610639d1fceb09cb418c65fcbe9136c31eee03a