diff options
| author | Eric Paris | 2014-03-07 17:41:32 +0100 |
|---|---|---|
| committer | Eric Paris | 2014-03-07 17:41:32 +0100 |
| commit | b7d3622a39fde7658170b7f3cf6c6889bb8db30d (patch) | |
| tree | 64f4e781ecb2a85d675e234072b988560bcd25f1 /kernel/auditsc.c | |
| parent | audit: whitespace fix in kernel-parameters.txt (diff) | |
| parent | Linux 3.13 (diff) | |
| download | kernel-qcow2-linux-b7d3622a39fde7658170b7f3cf6c6889bb8db30d.tar.gz kernel-qcow2-linux-b7d3622a39fde7658170b7f3cf6c6889bb8db30d.tar.xz kernel-qcow2-linux-b7d3622a39fde7658170b7f3cf6c6889bb8db30d.zip | |
Merge tag 'v3.13' into for-3.15
Linux 3.13
Conflicts:
include/net/xfrm.h
Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.
Diffstat (limited to 'kernel/auditsc.c')
0 files changed, 0 insertions, 0 deletions