Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 6 Jan 2016 19:58:13 +0000 (20:58 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 6 Jan 2016 20:14:35 +0000 (21:14 +0100)
commit9d9938854efcf2f21381b930bc1324e95640e0c4
tree7b136c25af5fcc64258f3427f985c1dc667ae0bd
parentca9ea7a5ffda53ce9e9f3e14b9b104d85db47c7d
parent3f37b26f8d57756b591383a9d8ce1cd628bc773c
Merge branch 'for-linus' into for-next

 Conflicts:
drivers/gpu/drm/i915/intel_display.c
sound/soc/intel/skylake/skl.h
13 files changed:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gem_stolen.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_hdmi.c
include/sound/soc.h
sound/soc/codecs/arizona.c
sound/soc/codecs/rt5645.c
sound/soc/intel/skylake/skl-topology.c
sound/soc/intel/skylake/skl.c
sound/soc/intel/skylake/skl.h