diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:51 +0100 |
| commit | 9d0af44c2ed036c663832f3b764ffd1109c8b79e (patch) | |
| tree | 629864b4ce2743873f672d2ca03c0e295fb98525 /sound/isa/wavefront/wavefront.c | |
| parent | ALSA: hda/realtek - Add Headset Mic supported for HP cPC (diff) | |
| parent | ALSA: hda: Apply aligned MMIO access only conditionally (diff) | |
| download | linux-dev-9d0af44c2ed036c663832f3b764ffd1109c8b79e.tar.xz linux-dev-9d0af44c2ed036c663832f3b764ffd1109c8b79e.zip | |
Merge branch 'for-linus' into for-next
Resolved the merge conflict in HD-audio Tegra driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/wavefront/wavefront.c')
0 files changed, 0 insertions, 0 deletions