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 | ||
| common.c | ||
| common.h | ||
| cpu-h7201.c | ||
| cpu-h7202.c | ||
| h7201-eval.c | ||
| h7202-eval.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||