From: James Morris <james.l.morris@oracle.com>
Date: Tue, 22 May 2012 01:21:06 +0000 (+1000)
Subject: Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
X-Git-Tag: v3.5-rc1~161^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff2bb047c4bce9742e94911eeb44b4d6ff4734ab;p=pandora-kernel.git

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

Per pull request, for 3.5.
---

ff2bb047c4bce9742e94911eeb44b4d6ff4734ab
Reading git-diff-tree failed