From: Linus Torvalds Date: Wed, 1 Jun 2011 07:35:37 +0000 (+0900) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: v3.0-rc2~21 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c6cce92bc8aee751aafe82c5d9caf7553226a3d;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: AppArmor: fix oops in apparmor_setprocattr --- 5c6cce92bc8aee751aafe82c5d9caf7553226a3d Reading git-diff-tree failed