Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile |
||
|---|---|---|
| .. | ||
| adma.c | ||
| cp6.c | ||
| gpio.c | ||
| i2c.c | ||
| io.c | ||
| Makefile | ||
| pci.c | ||
| pmu.c | ||
| setup.c | ||
| time.c | ||
Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile |
||
|---|---|---|
| .. | ||
| adma.c | ||
| cp6.c | ||
| gpio.c | ||
| i2c.c | ||
| io.c | ||
| Makefile | ||
| pci.c | ||
| pmu.c | ||
| setup.c | ||
| time.c | ||