]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit33f829f106a43866ba97ef6eaedce0ae0b3ca633
tree7b136c25af5fcc64258f3427f985c1dc667ae0bd
parent0725a90659652fb9348aa7294c900d460db769a9
parentb44db4febe1e52ac6715ecd962a25a7d501e0941
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