Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| addr-map.c | ||
| common.c | ||
| common.h | ||
| dove-db-setup.c | ||
| irq.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| pcie.c | ||
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| addr-map.c | ||
| common.c | ||
| common.h | ||
| dove-db-setup.c | ||
| irq.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| pcie.c | ||