| commit | 241bc82e62b28fdb7223b85180fd814f4963c971 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Tue Aug 22 15:44:45 2017 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Tue Aug 22 15:44:45 2017 +0200 |
| tree | f0d1a3889fd027e017faa37fc34bffe2fa038c41 | |
| parent | 3a93d082bacf887b47737c4b75c083dea7570832 [diff] | |
| parent | 88c54cdf61f508ebcf8da2d819f5dfc03e954d1d [diff] |
Merge branch 'for-linus' into for-next Conflicts: sound/core/control.c