Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for...
authorIngo Molnar <mingo@kernel.org>
Fri, 6 Jun 2014 05:55:06 +0000 (07:55 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 6 Jun 2014 05:55:06 +0000 (07:55 +0200)
commitec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05
treec28975d7daf6d8a3aa23afe8f42837b71105b269
parent8c6e549a447c51f4f8c0ba7f1e444469f75a354a
parente041e328c4b41e1db79bfe5ba9992c2ed771ad19
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>
arch/x86/kernel/process_64.c
arch/x86/kernel/traps.c
include/linux/perf_event.h
kernel/events/core.c
kernel/hrtimer.c
kernel/sched/core.c
tools/lib/lockdep/Makefile