988addf82e
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
---|---|---|
.. | ||
clock_imx21.c | ||
clock_imx27.c | ||
cpu_imx27.c | ||
devices.c | ||
devices.h | ||
eukrea_mbimx27-baseboard.c | ||
Kconfig | ||
mach-cpuimx27.c | ||
mach-imx27lite.c | ||
mach-mx21ads.c | ||
mach-mx27_3ds.c | ||
mach-mx27ads.c | ||
mach-mxt_td60.c | ||
mach-pca100.c | ||
mach-pcm038.c | ||
Makefile | ||
Makefile.boot | ||
mm-imx21.c | ||
mm-imx27.c | ||
pcm970-baseboard.c | ||
serial.c |