Merge branches 'hwbreak', 'perf/updates' and 'perf/system-pmus' into for-rmk

Browse source

...

This commit is contained in:

Will Deacon 2011-08-31 10:50:37 +01:00

parent d12443363e 7325eaec43

commit 4fb0d2ea39

7 changed files with 640 additions and 686 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

93

arch/arm/include/asm/pmu.h

View file

485

arch/arm/kernel/perf_event.c

View file

87

arch/arm/kernel/perf_event_v6.c

View file

405

arch/arm/kernel/perf_event_v7.c

View file

90

arch/arm/kernel/perf_event_xscale.c

View file

182

arch/arm/kernel/pmu.c

View file

4

kernel/events/core.c

View file