| commit | 4af88a9c1ba2d39263eef003ea598c657014e59e | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Thu Jun 11 06:52:31 2015 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Thu Jun 11 06:52:31 2015 +0200 |
| tree | 0470cb215c77b91147f23f55c63a733e3628a8cb | |
| parent | 692af901df615b7783caaccdb287cddf2d7f6059 [diff] | |
| parent | bf06848bdbe549175d25d2327ab9f37d4bd556b7 [diff] |
Merge branch 'for-linus' into for-next This merges and resolves the non-trivial conflicts with the recent fix for hda-i915 binding fallback. Conflicts: sound/pci/hda/hda_intel.c Signed-off-by: Takashi Iwai <tiwai@suse.de>