| commit | b99ca60c83a631adaba9c2fff8f2dd14d3517a61 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 11 19:56:25 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 11 19:56:25 2011 -0700 |
| tree | f4226d85217786aceb727aa53040cefc4ab2ea75 | |
| parent | 56a210526adb2854d5b7c398a40260720390ee05 [diff] | |
| parent | 1780f2d3839a0d3eb85ee014a708f9e2c8f8ba0e [diff] |
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