67fcdead3c
Conflicts: sound/soc/soc-core.c |
||
---|---|---|
.. | ||
caiaq | ||
usx2y | ||
Kconfig | ||
Makefile | ||
usbaudio.c | ||
usbaudio.h | ||
usbmidi.c | ||
usbmixer.c | ||
usbmixer_maps.c | ||
usbquirks.h |
67fcdead3c
Conflicts: sound/soc/soc-core.c |
||
---|---|---|
.. | ||
caiaq | ||
usx2y | ||
Kconfig | ||
Makefile | ||
usbaudio.c | ||
usbaudio.h | ||
usbmidi.c | ||
usbmixer.c | ||
usbmixer_maps.c | ||
usbquirks.h |