Merge branch 'linus' into perf/urgent, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Thu, 2 Mar 2017 07:05:45 +0000 (08:05 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 2 Mar 2017 07:05:45 +0000 (08:05 +0100)
commit9d020d33fc1b2faa0eb35859df1381ca5dc94ffe
treeadcd4356b93b17b42c9e4ef95c3fea3afa52f3ee
parent6b0b7551428e4caae1e2c023a529465a9a9ae2d4
parent4977ab6e92e267afe9d8f78438c3db330ca8434c
Merge branch 'linus' into perf/urgent, to resolve conflict

 Conflicts:
arch/powerpc/configs/85xx/kmp204x_defconfig

Signed-off-by: Ingo Molnar <mingo@kernel.org>