Merge branch 'for-linus' into for-next

Resolved the merge conflict in HD-audio Tegra driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2020-01-20 11:44:35 +01:00
commit 9d0af44c2e
18 changed files with 280 additions and 113 deletions