| commit | c151694b2c48d956ac8c8c59c6927f89cc29ef70 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Wed Mar 09 14:12:07 2011 +1100 |
| committer | James Morris <jmorris@namei.org> | Wed Mar 09 14:12:07 2011 +1100 |
| tree | 6d24bfde33c2c5899ea33aef4b81d06d7ac36a2f | |
| parent | fe3fa43039d47ee4e22caf460b79b62a14937f79 [diff] | |
| parent | 1936113c820bc3bfac49c266ccf972f7f8552aae [diff] |
Merge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next