From: James Morris Date: Thu, 30 Jun 2011 08:44:55 +0000 (+1000) Subject: Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/appar... X-Git-Tag: firefly_0821_release~3680^2~4825^2~27 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=da3f1c7b7d34e66cf571a613525ca0d23f92d42f;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-security' of git://git./linux/kernel/git/jj/apparmor-dev into next --- da3f1c7b7d34e66cf571a613525ca0d23f92d42f