Merge branch 'perf/urgent' into perf/core

Browse source

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

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

...

This commit is contained in:

Ingo Molnar 2013-06-19 12:44:41 +02:00

parent afb71193a4 f1a527899e

commit eff2108f02

5 changed files with 187 additions and 85 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

3

include/linux/perf_event.h

View file