From: Ingo Molnar Date: Wed, 28 Oct 2015 12:17:01 +0000 (+0100) Subject: Merge branch 'linus' into core/rcu, to fix up a semantic conflict X-Git-Tag: v4.4-rc1~158^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4340bbb07dd38339c0773543dd928886e512a57;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'linus' into core/rcu, to fix up a semantic conflict Signed-off-by: Ingo Molnar --- e4340bbb07dd38339c0773543dd928886e512a57