From: Paul Moore <pmoore@redhat.com>
Date: Tue, 28 Jan 2014 19:44:16 +0000 (-0500)
Subject: Merge tag 'v3.13' into stable-3.14
X-Git-Tag: Ubuntu-5.0.0-8.9~12058^2^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=825e587af2e90e9b953849f3347a01d8f383d577;p=mirror_ubuntu-disco-kernel.git

Merge tag 'v3.13' into stable-3.14

Linux 3.13

Conflicts:
	security/selinux/hooks.c

Trivial merge issue in selinux_inet_conn_request() likely due to me
including patches that I sent to the stable folks in my next tree
resulting in the patch hitting twice (I think).  Thankfully it was an
easy fix this time, but regardless, lesson learned, I will not do that
again.
---

825e587af2e90e9b953849f3347a01d8f383d577