mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
9d0af44c2e
Resolved the merge conflict in HD-audio Tegra driver. Signed-off-by: Takashi Iwai <tiwai@suse.de> |
||
---|---|---|
.. | ||
amdtp-tascam.c | ||
Makefile | ||
tascam-hwdep.c | ||
tascam-midi.c | ||
tascam-pcm.c | ||
tascam-proc.c | ||
tascam-stream.c | ||
tascam-transaction.c | ||
tascam.c | ||
tascam.h |