Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Mar 2008 16:48:49 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Mar 2008 16:48:49 +0000 (09:48 -0700)
commit6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34
treeb26de4b88337bc9ce18a7fa4492a0ac2ba5182b0
parentba422428295f19a3eef072b47c83202492ccab2f
parent504e75d0ed3389747e40a4aaa4b1f4e569576665
Merge branch 'for-linus' of git://git390.osdl.marist.edu/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.