Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus

Conflicts:
	lib/flex_array.c
	security/selinux/avc.c
	security/selinux/hooks.c
	security/selinux/ss/policydb.c
	security/smack/smack_lsm.c

Manually resolve conflicts.

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0b415248ae25..2db39d61b3fe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5592,10 +5592,11 @@ M:	James Morris <jmorris@namei.org>
 M:      Eric Paris <eparis@parisplace.org>
 L:      selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:      http://selinuxproject.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
+T:      git git://git.infradead.org/users/eparis/selinux.git
 S:      Supported
 F:      include/linux/selinux*
 F:      security/selinux/
+F:      scripts/selinux/
 
 APPARMOR SECURITY MODULE
 M:      John Johansen <john.johansen@canonical.com>