From: James Morris <jmorris@namei.org>
Date: Tue, 24 May 2011 13:20:19 +0000 (+1000)
Subject: Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus
X-Git-Tag: v3.0-rc1~309^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7b57551bbda1390959207f79f2038aa7adb72ae;p=pandora-kernel.git

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>
---

b7b57551bbda1390959207f79f2038aa7adb72ae
Reading git-diff-tree failed