From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 9 Dec 2013 08:17:02 +0000 (+0100)
Subject: Merge tag 'v3.13-rc3' into drm-intel-next-queued
X-Git-Tag: v3.14-rc1~47^2~44^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7698ba75fa283435f5077b9dfb4319d28b9de9a;p=pandora-kernel.git

Merge tag 'v3.13-rc3' into drm-intel-next-queued

Linux 3.13-rc3

I need a backmerge for two reasons:
- For merging the ppgtt patches from Ben I need to pull in the bdw
  support.
- We now have duplicated calls to intel_uncore_forcewake_reset in the
  setup code to due 2 different patches merged into -next and 3.13.
  The conflict is silen so I need the merge to be able to apply
  Deepak's fixup patch.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

Trivial conflict, it doesn't even show up in the merge diff.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

f7698ba75fa283435f5077b9dfb4319d28b9de9a
Reading git-diff-tree failed