Merge tag 'v3.13' into next
authorPaul Moore <pmoore@redhat.com>
Thu, 23 Jan 2014 20:52:06 +0000 (15:52 -0500)
committerPaul Moore <pmoore@redhat.com>
Thu, 23 Jan 2014 20:52:06 +0000 (15:52 -0500)
commit41be702a542a0d14bb0b1c16e824fa9ed27616ec
treee48942a05882da47544e179c6a0c920e00137a6a
parent8ed814602876bec9bad2649ca17f34b499357a1c
parentd8ec26d7f8287f5788a494f56e8814210f0e64be
Merge tag 'v3.13' into next

Linux 3.13

Minor fixup needed in selinux_inet_conn_request()

Conflicts:
security/selinux/hooks.c
security/selinux/hooks.c