Commits
Merge branch 'linus' into perf/urgent, to resolve conflict Conflicts: arch/powerpc/configs/85xx/kmp204x_defconfig Signed-off-by: Ingo Molnar <mingo@kernel.org>
Merge branch 'linus' into perf/urgent, to resolve conflict Conflicts: arch/powerpc/configs/85xx/kmp204x_defconfig Signed-off-by: Ingo Molnar <mingo@kernel.org>