Conflicts: arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/poodle.c arch/arm/mach-pxa/spitz.c |
||
|---|---|---|
| .. | ||
| generic.c | ||
| Kconfig | ||
| Makefile | ||
| omap2.c | ||
| onenand_base.c | ||
| onenand_bbt.c | ||
| onenand_sim.c | ||
Conflicts: arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/poodle.c arch/arm/mach-pxa/spitz.c |
||
|---|---|---|
| .. | ||
| generic.c | ||
| Kconfig | ||
| Makefile | ||
| omap2.c | ||
| onenand_base.c | ||
| onenand_bbt.c | ||
| onenand_sim.c | ||