| commit | 9d0af44c2ed036c663832f3b764ffd1109c8b79e | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Jan 20 11:44:35 2020 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Jan 20 11:44:51 2020 +0100 |
| tree | 629864b4ce2743873f672d2ca03c0e295fb98525 | |
| parent | 5af29028fd6db9438b5584ab7179710a0a22569d [diff] | |
| parent | 4d024fe8f806e20e577cc934204c5784c7063293 [diff] |
Merge branch 'for-linus' into for-next Resolved the merge conflict in HD-audio Tegra driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>