Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Dec 2015 07:33:34 +0000 (08:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Dec 2015 07:33:34 +0000 (08:33 +0100)
commit59c8231089be96165735585694a801ae58ec6c95
tree41bd60a9aec5df20e07a81fbb526c8bc05e997fc
parentde5126cc3c0b0f291d08fa591dcdf237bc595a56
parent0fb0b822d157325b66c503d23332f64899bfb828
Merge branch 'for-linus' into for-next

Conflicts:
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/drm_probe_helper.c
drivers/gpu/drm/i915/i915_gem_context.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
sound/pci/hda/hda_intel.c