diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-21 22:42:50 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-21 22:42:50 +0100 |
| commit | 22b61a11fd4e6d7a48d694ce350331bebc0394ed (patch) | |
| tree | f4be46c8154f5094c248fcd9fdf644b236f591b3 /arch/arm/plat-iop/pci.c | |
| parent | [ARM] 5399/1: [AT91] Configure MCLK and SSC for AT91SAMG20-EK (diff) | |
| parent | [ARM] dma: RiscPC: don't modify DMA SG entries (diff) | |
| download | linux-22b61a11fd4e6d7a48d694ce350331bebc0394ed.tar.xz linux-22b61a11fd4e6d7a48d694ce350331bebc0394ed.zip | |
Merge branch 'dma' into devel
Conflicts:
arch/arm/plat-mxc/dma-mx1-mx2.c
Diffstat (limited to 'arch/arm/plat-iop/pci.c')
0 files changed, 0 insertions, 0 deletions