| commit | 6defb60ae4ffe92c29291ed49695daa255b8f559 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Fri Mar 04 08:41:41 2016 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Fri Mar 04 08:41:41 2016 +0100 |
| tree | 67506a05d171df966b8ca9efa261fa307025e91e | |
| parent | 03367bf7fd30165bda3b037b3078cfa231ba33b7 [diff] | |
| parent | 790b415c98de62602810b0eedce26f0f9d6ddd78 [diff] |
Merge branch 'for-linus' into for-next Resolved the conflicts with the latest HDA HDMI fixes. Signed-off-by: Takashi Iwai <tiwai@suse.de>