summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 14:06:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 14:06:17 -0700
commitb61f6a57f1919ef8dbd33f864df9b8b361c65b11 (patch)
tree9341bc1a3f6a8fdcd19f97d5bcf1a658ab7fc92c /arch/x86
parent0575db881d18a4791013fc93ba756ad08b18fb48 (diff)
parentfb62db2ba943b1683f1d7181bb2988fce4c60870 (diff)
downloadop-kernel-dev-b61f6a57f1919ef8dbd33f864df9b8b361c65b11.zip
op-kernel-dev-b61f6a57f1919ef8dbd33f864df9b8b361c65b11.tar.gz
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 'arch/x86')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud