Merge branch 'perf/urgent' into perf/core, to pick up fixes

Browse source

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2015-12-04 10:35:29 +01:00

parent ac675d0d58 4e93ad601a

commit 42a0789bf5

3 changed files with 41 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/kernel/cpu/perf_event.h

View file

2

arch/x86/kernel/cpu/perf_event_intel.c

View file

51

kernel/events/core.c

View file