| commit | 9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Sun Jan 26 09:31:34 2020 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Sun Jan 26 09:31:41 2020 +0100 |
| tree | 986201af09ea4cd734ac5afa4a069cb9e56b78e9 | |
| parent | 5396c4bd9fd8429050f6191663b6c491e6402da2 [diff] | |
| parent | b81cbf7abfc94878a3c6f0789f2185ee55b1cc21 [diff] |
Merge branch 'for-linus' into for-next Resolve conflicts and correct the hex numbers, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>