| commit | 9d9938854efcf2f21381b930bc1324e95640e0c4 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Jan 06 20:58:13 2016 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Jan 06 21:14:35 2016 +0100 |
| tree | 7b136c25af5fcc64258f3427f985c1dc667ae0bd | |
| parent | ca9ea7a5ffda53ce9e9f3e14b9b104d85db47c7d [diff] | |
| parent | 3f37b26f8d57756b591383a9d8ce1cd628bc773c [diff] |
Merge branch 'for-linus' into for-next Conflicts: drivers/gpu/drm/i915/intel_display.c sound/soc/intel/skylake/skl.h