]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2ab4c3a03a8846009ca058ed004c740521790a39
treec28975d7daf6d8a3aa23afe8f42837b71105b269
parent769fa01120b543a592ffe40fc6c8cc2c42008732
parent0f1921d5d78563ade05e4f0e1b8da250d5bdf7dc
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