diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 22:31:35 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 22:32:03 +0000 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /tools/perf/scripts/python/syscall-counts-by-pid.py | |
| parent | ARM: DMA: add support for DMA debugging (diff) | |
| parent | ARM: TWD: enable one-shot mode (diff) | |
| download | linux-dev-4ec3eb13634529c0bc7466658d84d0bbe3244aea.tar.xz linux-dev-4ec3eb13634529c0bc7466658d84d0bbe3244aea.zip | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts-by-pid.py')
0 files changed, 0 insertions, 0 deletions