• Eric Paris's avatar
    Merge tag 'v3.13' into for-3.15 · b7d3622a
    Eric Paris authored
    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.
    b7d3622a
MAINTAINERS 262 KB