Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 28 Mar 2006 17:25:22 +0000 (09:25 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 28 Mar 2006 17:25:22 +0000 (09:25 -0800)
commit78cd9e04e0acea4f622e84ca0c760c7eae0c6854
tree6df4f07bfa77f8115e4250a14be76c04a2b5dc3e
parentec7e15d6486e9d1da1c2f344b670b8388ba7019b
parent6e57a3a89785692bd8d012d80f5ee210ab8e0b68
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Implement futex_atomic_cmpxchg_inatomic().