From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 28 Mar 2006 17:25:22 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.17-rc1~209
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=78cd9e04e0acea4f622e84ca0c760c7eae0c6854;p=safe%2Fjmp%2Flinux-2.6

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().
---

78cd9e04e0acea4f622e84ca0c760c7eae0c6854