Skip to content
Snippets Groups Projects
Commit b7d3622a authored by Eric Paris's avatar Eric Paris
Browse files

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.
parents f3411cb2 d8ec26d7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 763 additions and 61 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment