Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Sun, 21 Apr 2013 08:57:33 +0000 (10:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 21 Apr 2013 08:57:33 +0000 (10:57 +0200)
commit73e21ce28d8d2b75140b742b01373c3a085ecc52
treeadd380154271f9a68be4099590f912b4ab4bed9f
parentb5210b2a34bae35fc00675462333af45676d727c
parentf1923820c447e986a9da0fc6bf60c1dccdf0408e
Merge branch 'perf/urgent' into perf/core

Conflicts:
arch/x86/kernel/cpu/perf_event_intel.c

Merge in the latest fixes before applying new patches, resolve the conflict.

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