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: KARO-TX6UL-2015-11-03~56^2~21^2~1 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=e4340bbb07dd38339c0773543dd928886e512a57 Merge branch 'linus' into core/rcu, to fix up a semantic conflict Signed-off-by: Ingo Molnar --- e4340bbb07dd38339c0773543dd928886e512a57