Merge git://git.infradead.org/users/eparis/selinux
authorPaul Moore <pmoore@redhat.com>
Wed, 18 Sep 2013 17:52:20 +0000 (13:52 -0400)
committerPaul Moore <pmoore@redhat.com>
Wed, 18 Sep 2013 17:52:20 +0000 (13:52 -0400)
commit98f700f317967d45cf60c9843b3c42ce3c286f7c
tree2e68b189ceb954182af56b8f6febe644119b7cd7
parent6e4664525b1db28f8c4e1130957f70a94c19213e
parent0b4bdb3573a86a88c829b9e4ad702859eb923e7e
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.
include/linux/security.h
security/capability.c
security/security.c
security/selinux/hooks.c
security/selinux/include/security.h
security/selinux/ss/policydb.c