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... X-Git-Tag: MMI-PSA29.97-13-9~10400^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=641628146c1986c966ae030e65bb6f30feef0fd0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus --- 641628146c1986c966ae030e65bb6f30feef0fd0