From: James Morris Date: Thu, 14 Jan 2016 01:11:58 +0000 (+1100) Subject: Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next X-Git-Tag: v4.5-rc1~70^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=acb2cfdb316ddc3fac8183c0f71edd1680713b10;p=users%2Fjedix%2Flinux-maple.git Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next --- acb2cfdb316ddc3fac8183c0f71edd1680713b10