Skip to content
Commit 9d020d33 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



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

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6b0b7551 4977ab6e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment