]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 19 Jun 2013 10:44:41 +0000 (12:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 19 Jun 2013 10:44:41 +0000 (12:44 +0200)
commitabe0919ff6c8af01fde202401d65dd63fcacf569
tree27d1fc8ab23cd81e4863c29cddc0fbe8cfe68431
parent8ba9076810acf6e6a1cf2f875da0077a6e7cc684
parent0e496b11b582be73b762ef3183bb14b604a0707b
Merge branch 'perf/urgent' into perf/core

Merge in the latest fixes, to avoid conflicts with ongoing work.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/perf_event.h
kernel/events/core.c