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 | ||
| fb.c | ||
| fb.h | ||
| generic.c | ||
| generic.h | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| nxdb500.c | ||
| nxdkn.c | ||
| nxeb500hmi.c | ||
| pfifo.c | ||
| time.c | ||
| xc.c | ||