Fix trivial conflict caused by silly spelling fix patch. Conflicts: sound/soc/codecs/wm8994.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
atmel-pcm.c | ||
atmel-pcm.h | ||
atmel_ssc_dai.c | ||
atmel_ssc_dai.h | ||
playpaq_wm8510.c | ||
sam9g20_wm8731.c | ||
snd-soc-afeb9260.c |
Fix trivial conflict caused by silly spelling fix patch. Conflicts: sound/soc/codecs/wm8994.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
atmel-pcm.c | ||
atmel-pcm.h | ||
atmel_ssc_dai.c | ||
atmel_ssc_dai.h | ||
playpaq_wm8510.c | ||
sam9g20_wm8731.c | ||
snd-soc-afeb9260.c |