From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 3 Apr 2013 09:25:32 +0000 (+0200)
Subject: Merge tag 'v3.9-rc5' into drm-intel-next-queued
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~55^2~51^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecb135a1a1953d2895d149e78926be479fdc6f2c;p=pandora-kernel.git

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>
---

ecb135a1a1953d2895d149e78926be479fdc6f2c
Reading git-diff-tree failed