| commit | b7d3622a39fde7658170b7f3cf6c6889bb8db30d | [log] [tgz] |
|---|---|---|
| author | Eric Paris <eparis@redhat.com> | Fri Mar 07 11:41:32 2014 -0500 |
| committer | Eric Paris <eparis@redhat.com> | Fri Mar 07 11:41:32 2014 -0500 |
| tree | 64f4e781ecb2a85d675e234072b988560bcd25f1 | |
| parent | f3411cb2b2e396a41ed3a439863f028db7140a34 [diff] | |
| parent | d8ec26d7f8287f5788a494f56e8814210f0e64be [diff] |
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.