]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 550e3b2 125234d)
Merge drm-fixes into drm-next.
authorDave Airlie <airlied@redhat.com>
Sun, 13 Mar 2016 23:42:34 +0000 (09:42 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 13 Mar 2016 23:46:02 +0000 (09:46 +1000)
commit9b61c0fcdf0cfd20a85d9856d46142e7f297de0a
treed4abe6aa3f4e1e088f9da1d0597e078b1fe58912tree
parent550e3b23a53c88adfa46e64f9d442743e65d47dacommit | diff
parent125234dc8b1cc862f52d8bd5b37c36cc59b2cb86commit | diff
Merge drm-fixes into drm-next.

Nouveau wanted this to avoid some worse conflicts when I merge that.
41 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu.h diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/cik.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/cik_sdma.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/vi.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/include/amd_shared.h diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/amd_powerplay.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_atomic.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_atomic_helper.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_irq.c diff1 | diff2 | blob | history
drivers/gpu/drm/i2c/tda998x_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_ddi.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_dp.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_hdmi.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_runtime_pm.c diff1 | diff2 | blob | history
drivers/gpu/drm/imx/ipuv3-crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/imx/ipuv3-plane.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/vc4/vc4_drv.h diff1 | diff2 | blob | history
drivers/media/i2c/adv7604.c diff1 | diff2 | blob | history
drivers/media/media-device.c diff1 | diff2 | blob | history
include/drm/drm_crtc.h diff1 | diff2 | blob | history
include/uapi/linux/media.h diff1 | diff2 | blob | history
Ubuntu Disco kernel mirror for Proxmox VE and PMG