Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
commit513694b5f931a62561d21eb97a4740ce37464a45
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Apr 2008 16:36:40 +0000 (28 09:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Apr 2008 16:36:40 +0000 (28 09:36 -0700)
treef340654b3d628c1b443751b1ba6a50f2b97bd4d6
parent46b958eb808b73a232efc962e730faffe7cff5c5
parentd7b41a24bfb5d7fa02f7b49be1293d468814e424
Merge git://git./linux/kernel/git/tglx/linux-2.6-hrt

* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ