Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| arm_timer.h | ||
| cache-l2x0.h | ||
| cache-tauros2.h | ||
| clps7111.h | ||
| coresight.h | ||
| cs89712.h | ||
| debug-8250.S | ||
| debug-pl01x.S | ||
| dec21285.h | ||
| entry-macro-iomd.S | ||
| ep7211.h | ||
| ep7212.h | ||
| gic.h | ||
| icst307.h | ||
| icst525.h | ||
| ioc.h | ||
| iomd.h | ||
| iop3xx-adma.h | ||
| iop3xx-gpio.h | ||
| iop3xx.h | ||
| iop_adma.h | ||
| it8152.h | ||
| linkup-l1110.h | ||
| locomo.h | ||
| memc.h | ||
| pci_v3.h | ||
| pl080.h | ||
| sa1111.h | ||
| scoop.h | ||
| ssp.h | ||
| uengine.h | ||
| vic.h | ||