9d0af44c2e
Resolved the merge conflict in HD-audio Tegra driver. Signed-off-by: Takashi Iwai <tiwai@suse.de> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| dice-alesis.c | ||
| dice-extension.c | ||
| dice-hwdep.c | ||
| dice-interface.h | ||
| dice-midi.c | ||
| dice-mytek.c | ||
| dice-pcm.c | ||
| dice-presonus.c | ||
| dice-proc.c | ||
| dice-stream.c | ||
| dice-tcelectronic.c | ||
| dice-transaction.c | ||
| dice.c | ||
| dice.h | ||