tree b26de4b88337bc9ce18a7fa4492a0ac2ba5182b0
parent ba422428295f19a3eef072b47c83202492ccab2f
parent 504e75d0ed3389747e40a4aaa4b1f4e569576665
author Linus Torvalds <torvalds@linux-foundation.org> 1206031729 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1206031729 -0700

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.