tree d591a08e7e45615b51d8b5ee1634a29920f62c3f
parent 434d42cfd05a7cc452457a81d2029540cba12150
parent 7a627e3b9a2bd0f06945bbe64bcf403e788ecf6e
author James Morris <jmorris@namei.org> 1306243219 +1000
committer James Morris <jmorris@namei.org> 1306243219 +1000

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>