aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-28 17:32:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-28 17:32:14 -0700
commitc31f403de62415c738ddc9e673cf8e722c82f861 (patch)
tree33d2bcb04a783c1f0e903c5a949d33381ccb1756 /security/selinux/include
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 (diff)
parentMerge branch 'linus' into core/futexes (diff)
downloadlinux-dev-c31f403de62415c738ddc9e673cf8e722c82f861.tar.xz
linux-dev-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 'security/selinux/include')
0 files changed, 0 insertions, 0 deletions