mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 15:41:36 +00:00
d5381e42f6
Fix trivial conflict caused by silly spelling fix patch. Conflicts: sound/soc/codecs/wm8994.c |
||
---|---|---|
.. | ||
eukrea-tlv320.c | ||
imx-pcm-dma-mx2.c | ||
imx-pcm-fiq.c | ||
imx-ssi.c | ||
imx-ssi.h | ||
Kconfig | ||
Makefile | ||
mx27vis-aic32x4.c | ||
phycore-ac97.c | ||
wm1133-ev1.c |