Merge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj...
authorJames Morris <jmorris@namei.org>
Wed, 9 Mar 2011 03:12:07 +0000 (14:12 +1100)
committerJames Morris <jmorris@namei.org>
Wed, 9 Mar 2011 03:12:07 +0000 (14:12 +1100)
commitc151694b2c48d956ac8c8c59c6927f89cc29ef70
tree6d24bfde33c2c5899ea33aef4b81d06d7ac36a2f
parentfe3fa43039d47ee4e22caf460b79b62a14937f79
parent1936113c820bc3bfac49c266ccf972f7f8552aae
Merge branch 'security-next' of git://git./linux/kernel/git/jj/apparmor-dev into next