summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 23:06:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 23:06:17 +0200
commitb61f6a57f1919ef8dbd33f864df9b8b361c65b11 (patch)
tree9341bc1a3f6a8fdcd19f97d5bcf1a658ab7fc92c /net
parentMerge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentfutex: Fix kernel-doc notation & typos (diff)
downloadlinux-b61f6a57f1919ef8dbd33f864df9b8b361c65b11.tar.xz
linux-b61f6a57f1919ef8dbd33f864df9b8b361c65b11.zip
Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Fix kernel-doc notation & typos futex: Add lock context annotations futex: Mark restart_block.futex.uaddr[2] __user futex: Change 3rd arg of fetch_robust_entry() to unsigned int*
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions