Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Apr 2008 16:36:40 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Apr 2008 16:36:40 +0000 (09:36 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ


Trivial merge