97fb44eb6b
Conflicts: arch/arm/mach-at91/gpio.c |
||
---|---|---|
.. | ||
include/mach | ||
dma.c | ||
irq.c | ||
Makefile | ||
Makefile.boot | ||
riscpc.c |
97fb44eb6b
Conflicts: arch/arm/mach-at91/gpio.c |
||
---|---|---|
.. | ||
include/mach | ||
dma.c | ||
irq.c | ||
Makefile | ||
Makefile.boot | ||
riscpc.c |