]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Mar 2009 00:32:14 +0000 (17:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Mar 2009 00:32:14 +0000 (17:32 -0700)
* '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


Trivial merge