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)
commitd9190f95246a63cb7a2c009319e1a96ff93a4764
tree0233826259cbe4cd44755ccc893b77a3e8ac5213
parent5c767048b5c994f7ffc1749607e461b3b8954045
parentadb000090071735383b8bd687680fca6e4310da8
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next