Merge tag 'v3.13' into for-3.15 (b7d3622a) · Commits · github.com / kvm-riscv / linux

Commit b7d3622a authored Mar 07, 2014 by

Eric Paris

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

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment