]> 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)
commita1031bbe7271d2f562a7b707c2603ebd4e1679f4
treec28975d7daf6d8a3aa23afe8f42837b71105b269
parentc084c3a84d972d910e75aa67796a74cb749245a1
parent099a22902984063b5c04fbb76738bf4cdabd0e89
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