988addf82e
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| Kconfig | ||
| Makefile | ||
| audmux-v1.c | ||
| audmux-v2.c | ||
| clock.c | ||
| cpu.c | ||
| devices.c | ||
| dma-mx1-mx2.c | ||
| ehci.c | ||
| gpio.c | ||
| iomux-v1.c | ||
| iomux-v3.c | ||
| irq.c | ||
| pwm.c | ||
| ssi-fiq-ksym.c | ||
| ssi-fiq.S | ||
| system.c | ||
| time.c | ||
| tzic.c | ||
| ulpi.c | ||