From: Linus Torvalds Date: Tue, 14 Jun 2011 18:28:38 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ca5432010e45d7f809b441b0c1e85e84b039cd85;p=linux-beck.git 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: Fix oops in tomoyo_mount_acl(). --- ca5432010e45d7f809b441b0c1e85e84b039cd85