tree af222e53d833ff7218577cf98e1b856d9d6bda93
parent c7da092a1f243bfd1bfb4124f538e69e941882da
parent e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf
author Ingo Molnar <mingo@kernel.org> 1510048386 +0100
committer Ingo Molnar <mingo@kernel.org> 1510048386 +0100

Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts

Conflicts:
	arch/x86/kernel/cpu/Makefile

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