404a02cbd2
Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h |
||
---|---|---|
.. | ||
include/plat | ||
Kconfig | ||
Makefile | ||
gpio.c | ||
timer.c |
404a02cbd2
Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h |
||
---|---|---|
.. | ||
include/plat | ||
Kconfig | ||
Makefile | ||
gpio.c | ||
timer.c |