Eric Paris b7d3622a39 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.

2014-03-07 11:41:32 -05:00

6.6 KiB

Raw Blame History

View Raw