43231b5be6
Conflicts: arch/arm/plat-omap/dmtimer.c Resolve merge conflict in omap_device.c as per Lothar Waßmann <LW@KARO-electronics.de>. |
||
---|---|---|
.. | ||
include/mach | ||
common.h | ||
core.c | ||
cpu.c | ||
impd1.c | ||
integrator_ap.c | ||
integrator_cp.c | ||
Kconfig | ||
leds.c | ||
lm.c | ||
Makefile | ||
Makefile.boot | ||
pci.c | ||
pci_v3.c |