aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-02 08:50:02 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-02 08:50:02 -0800
commit0ca2b776ab1f4ba99d7f592baa4ff8525e53b050 (patch)
tree9a71bafec47e7f344a65e2dc7085512b4c521ee5 /include/linux
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
parent[SPARC64]: Fix futex_atomic_cmpxchg_inatomic implementation. (diff)
Merge master.kernel.org:/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.
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions