Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable

Browse source

...

This commit is contained in:

Russell King 2013-01-23 22:43:41 +00:00

parent 1501396e56 9dcbf46655

commit ff70ca7330

6 changed files with 75 additions and 49 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

33

arch/arm/include/asm/cputype.h

View file

16

arch/arm/kernel/perf_event.c

View file

51

arch/arm/kernel/perf_event_cpu.c

View file

4

arch/arm/kernel/perf_event_v6.c

View file

18

arch/arm/kernel/perf_event_v7.c

View file

2

arch/arm/kernel/perf_event_xscale.c

View file