git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ca9ea7a 3f37b26)

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	9d9938854efcf2f21381b930bc1324e95640e0c4
tree	7b136c25af5fcc64258f3427f985c1dc667ae0bd	tree \| snapshot
parent	ca9ea7a5ffda53ce9e9f3e14b9b104d85db47c7d	commit \| diff
parent	3f37b26f8d57756b591383a9d8ce1cd628bc773c	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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git