Conflicts: drivers/dma/imx-dma.c drivers/dma/pl330.c Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> |
||
|---|---|---|
| .. | ||
| bus.h | ||
| clcd.h | ||
| kmi.h | ||
| mmci.h | ||
| pl08x.h | ||
| pl022.h | ||
| pl061.h | ||
| pl093.h | ||
| pl330.h | ||
| serial.h | ||
Conflicts: drivers/dma/imx-dma.c drivers/dma/pl330.c Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> |
||
|---|---|---|
| .. | ||
| bus.h | ||
| clcd.h | ||
| kmi.h | ||
| mmci.h | ||
| pl08x.h | ||
| pl022.h | ||
| pl061.h | ||
| pl093.h | ||
| pl330.h | ||
| serial.h | ||