From: Linus Torvalds Date: Sun, 29 Mar 2009 00:32:14 +0000 (-0700) Subject: Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c31f403de62415c738ddc9e673cf8e722c82f861;p=linux-2.6-omap-h63xx.git 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: remove the pointer math from double_unlock_hb, fix futex: remove the pointer math from double_unlock_hb futex: clean up fault logic futex: unlock before returning -EFAULT futex: use current->time_slack_ns for rt tasks too futex: add double_unlock_hb() futex: additional (get|put)_futex_key() fixes futex: update futex commentary --- c31f403de62415c738ddc9e673cf8e722c82f861