diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-29 01:32:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-29 01:32:14 +0100 |
commit | c31f403de62415c738ddc9e673cf8e722c82f861 (patch) | |
tree | 33d2bcb04a783c1f0e903c5a949d33381ccb1756 /drivers/sh/maple | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
parent | Merge branch 'linus' into core/futexes (diff) | |
download | linux-c31f403de62415c738ddc9e673cf8e722c82f861.tar.xz linux-c31f403de62415c738ddc9e673cf8e722c82f861.zip |
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
Diffstat (limited to 'drivers/sh/maple')
0 files changed, 0 insertions, 0 deletions