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 |
||
|---|---|---|
| .. | ||
| include/mach | ||
| core.c | ||
| espresso.c | ||
| ixdp2351.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| pci.c | ||
| roadrunner.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 |
||
|---|---|---|
| .. | ||
| include/mach | ||
| core.c | ||
| espresso.c | ||
| ixdp2351.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| pci.c | ||
| roadrunner.c | ||