Merge tag 'v3.13' into for-3.15
authorEric Paris <eparis@redhat.com>
Fri, 7 Mar 2014 16:41:32 +0000 (11:41 -0500)
committerEric Paris <eparis@redhat.com>
Fri, 7 Mar 2014 16:41:32 +0000 (11:41 -0500)
commitb7d3622a39fde7658170b7f3cf6c6889bb8db30d
tree64f4e781ecb2a85d675e234072b988560bcd25f1
parentf3411cb2b2e396a41ed3a439863f028db7140a34
parentd8ec26d7f8287f5788a494f56e8814210f0e64be
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.
Documentation/kernel-parameters.txt
MAINTAINERS
include/linux/init_task.h
include/net/xfrm.h
include/uapi/linux/audit.h
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c
security/selinux/ss/services.c
security/smack/smack_lsm.c