• D
    Merge tag 'v3.9-rc5' into drm-intel-next-queued · ecb135a1
    Daniel Vetter 提交于
    Backmerge Linux 3.9-rc5 since I want to merge a few dp clock cleanups
    for -next, but they will conflict all over the place with
    
    commit 9d1a455b
    Author: Takashi Iwai <tiwai@suse.de>
    Date:   Mon Mar 18 11:25:36 2013 +0100
    
        drm/i915: Use the fixed pixel clock for eDP in intel_dp_set_m_n()
    
    from -fixes.
    
    Conflicts:
    	drivers/gpu/drm/i915/intel_dp.c: Simply adjacent lines changed.
    	drivers/gpu/drm/i915/intel_panel.c: A field rename in -next
    	conflicts with a bugfix in -fixes. Take the version from
    	-fixes and apply the rename.
    Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
    ecb135a1
intel_pm.c 127.3 KB