22b61a11fd
Conflicts: arch/arm/plat-mxc/dma-mx1-mx2.c |
||
---|---|---|
.. | ||
include/mach | ||
Makefile | ||
Makefile.boot | ||
core.c | ||
dma.c | ||
irq.c | ||
leds.c | ||
pci.c |
22b61a11fd
Conflicts: arch/arm/plat-mxc/dma-mx1-mx2.c |
||
---|---|---|
.. | ||
include/mach | ||
Makefile | ||
Makefile.boot | ||
core.c | ||
dma.c | ||
irq.c | ||
leds.c | ||
pci.c |