]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Fri, 4 Oct 2013 07:59:13 +0000 (09:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 4 Oct 2013 07:59:13 +0000 (09:59 +0200)
commit75ddcda6da9513e74ffdb419633120c9b78b8b75
tree0eccb0baf343cad79a54e352598921db9ca17620
parentd215258a0c2480006e439471cb8c6b178e9039f3
parentdc068e6b1a5e2901d9f078e750ff0fb70fd62d62
Merge branch 'perf/urgent' into perf/core

Pick up the latest fixes before applying new patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event_intel.c
arch/x86/kernel/cpu/perf_event_intel_ds.c