From: James Morris <james.l.morris@oracle.com>
Date: Thu, 15 Mar 2012 03:43:02 +0000 (+1100)
Subject: Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux... 
X-Git-Tag: firefly_0821_release~3680^2~3326^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b01d3fb921df9baef1ecd13704f4b1e269b58b6b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-security' of git://git./linux/kernel/git/jj/linux-apparmor into next
---

b01d3fb921df9baef1ecd13704f4b1e269b58b6b