58daf18cdc
Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile |
||
---|---|---|
.. | ||
include/plat | ||
Makefile | ||
clock.c | ||
leds.c | ||
sched-clock.c |
58daf18cdc
Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile |
||
---|---|---|
.. | ||
include/plat | ||
Makefile | ||
clock.c | ||
leds.c | ||
sched-clock.c |