Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux...
authorJames Morris <james.l.morris@oracle.com>
Thu, 15 Mar 2012 03:43:02 +0000 (14:43 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 15 Mar 2012 03:43:02 +0000 (14:43 +1100)
commitb01d3fb921df9baef1ecd13704f4b1e269b58b6b
tree1ca714b40774cd56c0194abee5c6577b2ba6aad2
parent6041e8346f2165679c2184cab60db768d6a26a1d
parent2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce
Merge branch 'for-security' of git://git./linux/kernel/git/jj/linux-apparmor into next