988addf82e
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| jive_wm8750.c | ||
| lm4857.h | ||
| ln2440sbc_alc650.c | ||
| neo1973_gta02_wm8753.c | ||
| neo1973_wm8753.c | ||
| s3c-ac97.c | ||
| s3c-ac97.h | ||
| s3c-dma.c | ||
| s3c-dma.h | ||
| s3c-i2s-v2.c | ||
| s3c-i2s-v2.h | ||
| s3c-pcm.c | ||
| s3c-pcm.h | ||
| s3c24xx-i2s.c | ||
| s3c24xx-i2s.h | ||
| s3c24xx_simtec.c | ||
| s3c24xx_simtec.h | ||
| s3c24xx_simtec_hermes.c | ||
| s3c24xx_simtec_tlv320aic23.c | ||
| s3c24xx_uda134x.c | ||
| s3c64xx-i2s.c | ||
| s3c64xx-i2s.h | ||
| s3c2412-i2s.c | ||
| s3c2412-i2s.h | ||
| smdk64xx_wm8580.c | ||
| smdk2443_wm9710.c | ||
| smdk_wm9713.c | ||