diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-07 02:53:35 (GMT) |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-07 02:53:35 (GMT) |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /security/apparmor/include/audit.h | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
| download | linux-fsl-qoriq-eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'security/apparmor/include/audit.h')
0 files changed, 0 insertions, 0 deletions