tree 1ca714b40774cd56c0194abee5c6577b2ba6aad2
parent 6041e8346f2165679c2184cab60db768d6a26a1d
parent 2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce
author James Morris <james.l.morris@oracle.com> 1331782982 +1100
committer James Morris <james.l.morris@oracle.com> 1331782982 +1100

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