forked from Minki/linux
2e18e04798
Conflicts: arch/sh/drivers/dma/dma-sh.c |
||
---|---|---|
.. | ||
dma-api.c | ||
dma-g2.c | ||
dma-pvr2.c | ||
dma-sh.c | ||
dma-sysfs.c | ||
dmabrg.c | ||
Kconfig | ||
Makefile |
2e18e04798
Conflicts: arch/sh/drivers/dma/dma-sh.c |
||
---|---|---|
.. | ||
dma-api.c | ||
dma-g2.c | ||
dma-pvr2.c | ||
dma-sh.c | ||
dma-sysfs.c | ||
dmabrg.c | ||
Kconfig | ||
Makefile |