9d0af44c2e
Resolved the merge conflict in HD-audio Tegra driver. Signed-off-by: Takashi Iwai <tiwai@suse.de> |
||
---|---|---|
.. | ||
Makefile | ||
amdtp-tascam.c | ||
tascam-hwdep.c | ||
tascam-midi.c | ||
tascam-pcm.c | ||
tascam-proc.c | ||
tascam-stream.c | ||
tascam-transaction.c | ||
tascam.c | ||
tascam.h |