tree c28975d7daf6d8a3aa23afe8f42837b71105b269
parent 8c6e549a447c51f4f8c0ba7f1e444469f75a354a
parent e041e328c4b41e1db79bfe5ba9992c2ed771ad19
author Ingo Molnar <mingo@kernel.org> 1402034106 +0200
committer Ingo Molnar <mingo@kernel.org> 1402034106 +0200

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches

Conflicts:
	arch/x86/kernel/traps.c

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