diff options
| author | Marek Szyprowski <[email protected]> | 2012-05-22 06:55:43 +0000 |
|---|---|---|
| committer | Marek Szyprowski <[email protected]> | 2012-05-22 06:55:43 +0000 |
| commit | 0f51596bd39a5c928307ffcffc9ba07f90f42a8b (patch) | |
| tree | b636403815316ecad2170092b70f1079df260a95 /tools/perf/util/trace-event-scripting.c | |
| parent | ARM: dma-mapping: use PMD size for section unmap (diff) | |
| parent | ARM: dma-mapping: add support for IOMMU mapper (diff) | |
| download | kernel-0f51596bd39a5c928307ffcffc9ba07f90f42a8b.tar.gz kernel-0f51596bd39a5c928307ffcffc9ba07f90f42a8b.zip | |
Merge branch 'for-next-arm-dma' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c
Signed-off-by: Marek Szyprowski <[email protected]>
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
0 files changed, 0 insertions, 0 deletions