Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 16:50:02 +0000 (08:50 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 16:50:02 +0000 (08:50 -0800)
commit0ca2b776ab1f4ba99d7f592baa4ff8525e53b050
tree9a71bafec47e7f344a65e2dc7085512b4c521ee5
parentaefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7
parentc7fed9d75074f7c243ec8ff2c55d04de2839a6f6
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix futex_atomic_cmpxchg_inatomic implementation.