| commit | cc1b76ed32607ba378986931e73b64231085816f | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Fri Jun 12 08:10:20 2015 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Fri Jun 12 08:10:20 2015 +0200 |
| tree | 2554500c3e743249afafd1857a3956aae1b2220e | |
| parent | 9e8af74c38162c884465385a7f1ded1c98cdc752 [diff] | |
| parent | 535115b5ff51c702a9a22feb918707c2fe1fbd17 [diff] |
Merge branch 'for-linus' into for-next Yet another non-trivial conflicts resolution for the recent HD-audio fix. Conflicts: sound/pci/hda/hda_intel.c Signed-off-by: Takashi Iwai <tiwai@suse.de>