| commit | a11377e47cf3f0174ea97a699a8ae0929b179aef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 27 12:29:39 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 27 12:29:39 2010 -0700 |
| tree | d73d0c41bc4f0ce8213cf575d7a105a252cc9ec4 | |
| parent | 381ba329e578755bc974b46c6a6f2ac286e89b40 [diff] | |
| parent | c8da96e87d349e9035345293093ecc74792fb96a [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: TOMOYO: Don't abuse sys_getpid(), sys_getppid()