Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| maple | ||
| superhyway | ||
| intc.c | ||
| Makefile | ||
| pfc.c | ||
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| maple | ||
| superhyway | ||
| intc.c | ||
| Makefile | ||
| pfc.c | ||