git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0725a90 b44db4f)

author	Takashi Iwai <tiwai@suse.de>
	Wed, 6 Jan 2016 19:58:13 +0000 (20:58 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Wed, 6 Jan 2016 20:14:35 +0000 (21:14 +0100)
commit	33f829f106a43866ba97ef6eaedce0ae0b3ca633
tree	7b136c25af5fcc64258f3427f985c1dc667ae0bd	tree \| snapshot
parent	0725a90659652fb9348aa7294c900d460db769a9	commit \| diff
parent	b44db4febe1e52ac6715ecd962a25a7d501e0941	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_stolen.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
include/sound/soc.h	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/arizona.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/rt5645.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl-topology.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.