Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/include/mach/hardware.h arch/arm/mach-pxa/spitz.c |
||
|---|---|---|
| .. | ||
| clock.c | ||
| dma.c | ||
| irq.c | ||
| Kconfig | ||
| mach-smdk2443.c | ||
| Makefile | ||
| s3c2443.c | ||
Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/include/mach/hardware.h arch/arm/mach-pxa/spitz.c |
||
|---|---|---|
| .. | ||
| clock.c | ||
| dma.c | ||
| irq.c | ||
| Kconfig | ||
| mach-smdk2443.c | ||
| Makefile | ||
| s3c2443.c | ||