From: Paul Moore <pmoore@redhat.com>
Date: Wed, 18 Sep 2013 17:52:20 +0000 (-0400)
Subject: Merge git://git.infradead.org/users/eparis/selinux
X-Git-Tag: v3.13-rc1~18^2~52^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98f700f317967d45cf60c9843b3c42ce3c286f7c;p=pandora-kernel.git

Merge git://git.infradead.org/users/eparis/selinux

Conflicts:
	security/selinux/hooks.c

Pull Eric's existing SELinux tree as there are a number of patches in
there that are not yet upstream.  There was some minor fixup needed to
resolve a conflict in security/selinux/hooks.c:selinux_set_mnt_opts()
between the labeled NFS patches and Eric's security_fs_use()
simplification patch.
---

98f700f317967d45cf60c9843b3c42ce3c286f7c
Reading git-diff-tree failed