From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Mar 2008 16:48:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.25-rc7~60
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] futex: let futex_atomic_cmpxchg_pt survive early functional tests.
---

6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34