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