summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-11 19:56:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-11 19:56:25 -0700
commitb99ca60c83a631adaba9c2fff8f2dd14d3517a61 (patch)
treef4226d85217786aceb727aa53040cefc4ab2ea75 /fs/proc
parent56a210526adb2854d5b7c398a40260720390ee05 (diff)
parent1780f2d3839a0d3eb85ee014a708f9e2c8f8ba0e (diff)
downloadlwn-b99ca60c83a631adaba9c2fff8f2dd14d3517a61.tar.gz
lwn-b99ca60c83a631adaba9c2fff8f2dd14d3517a61.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: AppArmor: Fix sleep in invalid context from task_setrlimit
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions