forked from Minki/linux
33b9f582c5
Conflicts: arch/arm/plat-omap/dmtimer.c |
||
---|---|---|
.. | ||
include/plat | ||
counter_32k.c | ||
debug-leds.c | ||
dma.c | ||
dmtimer.c | ||
i2c.c | ||
Kconfig | ||
mailbox.c | ||
Makefile | ||
sram.c |
33b9f582c5
Conflicts: arch/arm/plat-omap/dmtimer.c |
||
---|---|---|
.. | ||
include/plat | ||
counter_32k.c | ||
debug-leds.c | ||
dma.c | ||
dmtimer.c | ||
i2c.c | ||
Kconfig | ||
mailbox.c | ||
Makefile | ||
sram.c |