Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/appar...
authorJames Morris <jmorris@namei.org>
Thu, 30 Jun 2011 08:44:55 +0000 (18:44 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 30 Jun 2011 08:44:55 +0000 (18:44 +1000)
commitda3f1c7b7d34e66cf571a613525ca0d23f92d42f
tree0233826259cbe4cd44755ccc893b77a3e8ac5213
parent5b944a71a192977c1c018bbcfa0c52dca48e2368
parent25e75dff519bcce2cb35023105e7df51d7b9e691
Merge branch 'for-security' of git://git./linux/kernel/git/jj/apparmor-dev into next