From: Linus Torvalds Date: Thu, 21 Oct 2010 21:06:17 +0000 (-0700) Subject: Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.37-rc1~193 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b61f6a57f1919ef8dbd33f864df9b8b361c65b11;p=pandora-kernel.git Merge branch 'futexes-for-linus' of git://git./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* --- b61f6a57f1919ef8dbd33f864df9b8b361c65b11 Reading git-diff-tree failed