• Dave Airlie's avatar
    Merge tag 'v3.18-rc7' into drm-next · e8115e79
    Dave Airlie authored
    This fixes a bunch of conflicts prior to merging i915 tree.
    
    Linux 3.18-rc7
    
    Conflicts:
    	drivers/gpu/drm/exynos/exynos_drm_drv.c
    	drivers/gpu/drm/i915/i915_drv.c
    	drivers/gpu/drm/i915/intel_pm.c
    	drivers/gpu/drm/tegra/dc.c
    e8115e79
r600_dpm.c 42.8 KB