Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| clock.c | ||
| cpu.c | ||
| init.c | ||
| Kconfig | ||
| mach-smdkc110.c | ||
| mach-smdkv210.c | ||
| Makefile | ||
| Makefile.boot | ||
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| clock.c | ||
| cpu.c | ||
| init.c | ||
| Kconfig | ||
| mach-smdkc110.c | ||
| mach-smdkv210.c | ||
| Makefile | ||
| Makefile.boot | ||