aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/futex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-15 09:21:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-15 09:21:04 -0700
commitafbf331ed1252c85753ac6790356c11e171f3d0b (patch)
tree40f3055808d5c33ea1d156cedc690895ae6201f9 /include/asm-x86/futex.h
parent6a6029b8cefe0ca7e82f27f3904dbedba3de4e06 (diff)
parentf1dd9c379cac7d5a76259e7dffcd5f8edc697d17 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: Fix tbench regression in 2.6.25-rc1
Diffstat (limited to 'include/asm-x86/futex.h')
0 files changed, 0 insertions, 0 deletions