• Daniel Vetter's avatar
    Merge branch 'drm-intel-next-fixes' into drm-intel-next · a8cbd459
    Daniel Vetter authored
    So I've sent the first pull request to Dave and I expect his request
    for a merge tree any second now ;-)
    
    More seriously I have some pending patches for 3.19 that depend upon
    both trees, hence backmerge. Conflicts are all trivial.
    
    Conflicts:
    	drivers/gpu/drm/i915/i915_irq.c
    	drivers/gpu/drm/i915/intel_display.c
    
    v2: Of course I've forgotten the fixup script for the silent conflict.
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
    a8cbd459
intel_drv.h 38 KB