| commit | bd71164abc141ea696014e3e23c561b0d7f1b434 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Sun May 12 21:28:38 2013 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Sun May 12 21:28:38 2013 +1000 |
| tree | 3b9c64698800566197bf4ecec604ba8bb1228bd3 | |
| parent | f722406faae2d073cc1d01063d1123c35425939e [diff] | |
| parent | 2654bfbc2bd0e1e64f0b257c21da23f6cec32c6c [diff] |
Merge tag 'aa-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into ra-next