From: Linus Torvalds Date: Thu, 6 Jan 2011 18:07:05 +0000 (-0800) Subject: Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v2.6.38-rc1~491 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=f3b0cfa9b017a9d4686c9b14b908a1685f97a077 Merge branch 'core-futexes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Add futex_q static initializer futex: Replace fshared and clockrt with combined flags futex: Cleanup stale fshared flag interfaces --- f3b0cfa9b017a9d4686c9b14b908a1685f97a077