]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:29:39 +0000 (12:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:29:39 +0000 (12:29 -0700)
commita11377e47cf3f0174ea97a699a8ae0929b179aef
treed73d0c41bc4f0ce8213cf575d7a105a252cc9ec4
parent381ba329e578755bc974b46c6a6f2ac286e89b40
parentc8da96e87d349e9035345293093ecc74792fb96a
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()