| commit | b01d3fb921df9baef1ecd13704f4b1e269b58b6b | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Mar 15 14:43:02 2012 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Mar 15 14:43:02 2012 +1100 |
| tree | 1ca714b40774cd56c0194abee5c6577b2ba6aad2 | |
| parent | 6041e8346f2165679c2184cab60db768d6a26a1d [diff] | |
| parent | 2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce [diff] |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next