| commit | a99e31512aa435e8391ba5f5e64abeac9c5f2f32 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Apr 04 11:51:08 2016 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Apr 04 11:51:08 2016 +0200 |
| tree | 56bb9d9ccfe76520b672249757e25f686275b204 | |
| parent | 86c8dd7f4da3fb3f92fc5ab5144c971639d39745 [diff] | |
| parent | f03b24a851d32ca85dacab01785b24a7ee717d37 [diff] |
Merge branch 'for-linus' into for-next Conflicts: sound/hda/hdac_i915.c Signed-off-by: Takashi Iwai <tiwai@suse.de>