diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-03 11:25:32 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-03 11:28:48 +0200 |
| commit | ecb135a1a1953d2895d149e78926be479fdc6f2c (patch) | |
| tree | e40aa30eefa5cc42ed1169b9798810a710a1bd9a /lib/rbtree.c | |
| parent | drm/i915: Fix sdvo connector get_hw_state function (diff) | |
| parent | Linux 3.9-rc5 (diff) | |
| download | linux-ecb135a1a1953d2895d149e78926be479fdc6f2c.tar.xz linux-ecb135a1a1953d2895d149e78926be479fdc6f2c.zip | |
Merge tag 'v3.9-rc5' into drm-intel-next-queued
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 9d1a455b0ca1c2c956b4d9ab212864a8695270f1
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/rbtree.c')
0 files changed, 0 insertions, 0 deletions