From: James Morris <james.l.morris@oracle.com>
Date: Mon, 6 Jan 2014 14:45:59 +0000 (+1100)
Subject: Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
X-Git-Tag: v3.14-rc1~147^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4a82a4a033d563f1dc2c944eec2358cb38432d0;p=pandora-kernel.git

Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next

Conflicts:
	security/selinux/hooks.c

Resolved using request struct.

Signed-off-by: James Morris <james.l.morris@oracle.com>
---

d4a82a4a033d563f1dc2c944eec2358cb38432d0
Reading git-diff-tree failed