4ec3eb1363
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
clock.h | ||
core.c | ||
dma.c | ||
gpio.c | ||
i2c.c | ||
irq.c | ||
Makefile | ||
Makefile.boot | ||
pm.c | ||
serial.c | ||
sleep.S | ||
time.c | ||
time.h |
4ec3eb1363
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
clock.h | ||
core.c | ||
dma.c | ||
gpio.c | ||
i2c.c | ||
irq.c | ||
Makefile | ||
Makefile.boot | ||
pm.c | ||
serial.c | ||
sleep.S | ||
time.c | ||
time.h |