From: Paul Moore <pmoore@redhat.com>
Date: Thu, 23 Jan 2014 20:52:06 +0000 (-0500)
Subject: Merge tag 'v3.13' into next
X-Git-Tag: v3.17-rc1~57^2~23
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=41be702a542a0d14bb0b1c16e824fa9ed27616ec;p=linux.git

Merge tag 'v3.13' into next

Linux 3.13

Minor fixup needed in selinux_inet_conn_request()

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

41be702a542a0d14bb0b1c16e824fa9ed27616ec