diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 23:35:26 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 23:35:26 +0000 |
| commit | bd1274dc005c2cee41771a7cc616f4709a6e6323 (patch) | |
| tree | fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca /tools/perf/scripts/python | |
| parent | Merge branch 'misc' into devel (diff) | |
| parent | ARM: 6653/1: bitops: Use BX instead of MOV PC,LR (diff) | |
| download | linux-bd1274dc005c2cee41771a7cc616f4709a6e6323.tar.gz linux-bd1274dc005c2cee41771a7cc616f4709a6e6323.zip | |
Merge branch 'v6v7' into devel
Conflicts:
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/mm/Kconfig
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions