d5381e42f6
Fix trivial conflict caused by silly spelling fix patch. Conflicts: sound/soc/codecs/wm8994.c |
||
---|---|---|
.. | ||
ac97.c | ||
dma.c | ||
dma.h | ||
goni_wm8994.c | ||
h1940_uda1380.c | ||
i2s.c | ||
i2s.h | ||
jive_wm8750.c | ||
Kconfig | ||
ln2440sbc_alc650.c | ||
Makefile | ||
neo1973_wm8753.c | ||
pcm.c | ||
pcm.h | ||
regs-i2s-v2.h | ||
rx1950_uda1380.c | ||
s3c24xx_simtec_hermes.c | ||
s3c24xx_simtec_tlv320aic23.c | ||
s3c24xx_simtec.c | ||
s3c24xx_simtec.h | ||
s3c24xx_uda134x.c | ||
s3c24xx-i2s.c | ||
s3c24xx-i2s.h | ||
s3c2412-i2s.c | ||
s3c2412-i2s.h | ||
s3c-i2s-v2.c | ||
s3c-i2s-v2.h | ||
smartq_wm8987.c | ||
smdk2443_wm9710.c | ||
smdk_spdif.c | ||
smdk_wm8580.c | ||
smdk_wm8580pcm.c | ||
smdk_wm8994.c | ||
smdk_wm9713.c | ||
spdif.c | ||
spdif.h | ||
speyside.c |