| commit | 1cd24eee18402b71d8a694e2d8c03a30a4e930bf | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 17:28:12 2015 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 17:28:14 2015 +1000 |
| tree | afc668a5fd411673f2e229dc97a46e65c3db9292 | |
| parent | f439bd128466a0471cfb2b8bb3bad4510999cdd1 [diff] | |
| parent | e6e29a4eae335059d2cc44ac543de7556ff7ac09 [diff] |
Merge remote-tracking branch 'security/next' Conflicts: include/linux/security.h security/capability.c security/security.c