f56f52e02a
Conflicts: arch/arm/plat-omap/dmtimer.c Resolved as suggested by Jon Hunter. |
||
---|---|---|
.. | ||
counter-32k.h | ||
cpu.h | ||
debug-devices.h | ||
dmtimer.h | ||
i2c.h | ||
iommu2.h | ||
iommu.h | ||
iopgtable.h | ||
iovmm.h | ||
mailbox.h | ||
omap-serial.h | ||
prcm.h | ||
sram.h | ||
timex.h | ||
vram.h |