commit | ed0217a79ad886b88179c70c6ffac27876324cf1 | [log] [tgz] |
---|---|---|
author | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 17:54:08 2015 +1000 |
committer | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 17:54:08 2015 +1000 |
tree | f4429a7b6b30eb96d5fc6cac204efabf37f80ca5 | |
parent | d85fbd9bd26f564a33d91e4242902c6802766703 [diff] | |
parent | 5c1390c9ffdaeb9f7e544cea3a1699a341cad1fb [diff] |
Merge remote-tracking branch 'audit/next' Conflicts: security/lsm_audit.c