From: James Morris Date: Fri, 27 Mar 2015 09:33:27 +0000 (+1100) Subject: Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus X-Git-Tag: v4.0-rc6~10^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=641628146c1986c966ae030e65bb6f30feef0fd0;p=linux.git Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus --- 641628146c1986c966ae030e65bb6f30feef0fd0