From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Apr 2008 16:36:40 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
X-Git-Tag: v2.6.26-rc1~717
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=513694b5f931a62561d21eb97a4740ce37464a45;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/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
---

513694b5f931a62561d21eb97a4740ce37464a45