tree d73d0c41bc4f0ce8213cf575d7a105a252cc9ec4
parent 381ba329e578755bc974b46c6a6f2ac286e89b40
parent c8da96e87d349e9035345293093ecc74792fb96a
author Linus Torvalds <torvalds@linux-foundation.org> 1285615779 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285615779 -0700

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()