tree adcd4356b93b17b42c9e4ef95c3fea3afa52f3ee
parent 6b0b7551428e4caae1e2c023a529465a9a9ae2d4
parent 4977ab6e92e267afe9d8f78438c3db330ca8434c
author Ingo Molnar <mingo@kernel.org> 1488438345 +0100
committer Ingo Molnar <mingo@kernel.org> 1488438345 +0100

Merge branch 'linus' into perf/urgent, to resolve conflict

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

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