Merge remote branch 'tip/perf/core' into oprofile/core

Browse Source

Conflicts:
	arch/arm/oprofile/common.c
	kernel/perf_event.c

...

This commit is contained in:

Robert Richter

2010-10-15 12:45:00 +02:00

parent 7df01d96b2 0fdf13606b

commit 6268464b37

463 changed files with 8396 additions and 3865 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

2379

kernel/perf_event.c

File diff suppressed because it is too large Load Diff