git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 47c0fd7 527e931)

author	Dave Airlie <airlied@redhat.com>
	Tue, 8 Dec 2015 01:04:26 +0000 (11:04 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 8 Dec 2015 01:04:26 +0000 (11:04 +1000)
commit	e876b41ab074561d65f213bf5e0fc68cf5bc7380
tree	5bcbd7e4f7b6ac2a34e61011f8eb2cde90bf8603	tree \| snapshot
parent	47c0fd72822159eb501411f975f5672a0bf7a7fb	commit \| diff
parent	527e9316f8ec44bd53d90fb9f611fa7ffff52bb9	commit \| diff

Back merge tag 'v4.4-rc4' into drm-next

We've picked up a few conflicts and it would be nice
to resolve them before we move onwards.

13 files changed:

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_fops.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_fence.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/imx-drm-core.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_display.c	diff1 \|	diff2 \|	blob \| history
include/drm/drmP.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree