| commit | 3b89f56783a4ef796190ef1192c25e72e0b986b6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 17 18:37:03 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 17 18:37:03 2010 -0700 |
| tree | 9d34f03092a38fd79f14003c88489323f32d9334 | |
| parent | 392abeea52db4dc870c0ea41912df8ca60b27d44 [diff] | |
| parent | 7cb4dc9fc95f89587f57f287b47e091d7806255e [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 task_setrlimit prototype