From: Ingo Molnar Date: Thu, 2 Mar 2017 07:05:45 +0000 (+0100) Subject: Merge branch 'linus' into perf/urgent, to resolve conflict X-Git-Tag: v4.11-rc2~31^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9d020d33fc1b2faa0eb35859df1381ca5dc94ffe;p=linux.git Merge branch 'linus' into perf/urgent, to resolve conflict Conflicts: arch/powerpc/configs/85xx/kmp204x_defconfig Signed-off-by: Ingo Molnar --- 9d020d33fc1b2faa0eb35859df1381ca5dc94ffe