From: Linus Torvalds Date: Mon, 27 Sep 2010 19:29:39 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: v2.6.36-rc6~14 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a11377e47cf3f0174ea97a699a8ae0929b179aef;p=pandora-kernel.git Merge branch 'for-linus' of git://git./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() --- a11377e47cf3f0174ea97a699a8ae0929b179aef Reading git-diff-tree failed