Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus
commitb7b57551bbda1390959207f79f2038aa7adb72ae
authorJames Morris <jmorris@namei.org>
Tue, 24 May 2011 13:20:19 +0000 (24 23:20 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 24 May 2011 13:20:19 +0000 (24 23:20 +1000)
treed591a08e7e45615b51d8b5ee1634a29920f62c3f
parent434d42cfd05a7cc452457a81d2029540cba12150
parent7a627e3b9a2bd0f06945bbe64bcf403e788ecf6e
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>
MAINTAINERS
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/selinuxfs.c
security/selinux/ss/services.c
security/smack/smack_lsm.c