diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-01-20 13:44:35 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-20 13:44:51 +0300 |
| commit | 9d0af44c2ed036c663832f3b764ffd1109c8b79e (patch) | |
| tree | 629864b4ce2743873f672d2ca03c0e295fb98525 /sound/core/init.c | |
| parent | 5af29028fd6db9438b5584ab7179710a0a22569d (diff) | |
| parent | 4d024fe8f806e20e577cc934204c5784c7063293 (diff) | |
| download | linux-9d0af44c2ed036c663832f3b764ffd1109c8b79e.tar.xz | |
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/core/init.c')
0 files changed, 0 insertions, 0 deletions