Merge tag 'v3.13-rc3' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 9 Dec 2013 08:17:02 +0000 (09:17 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 9 Dec 2013 08:19:14 +0000 (09:19 +0100)
commitf7698ba75fa283435f5077b9dfb4319d28b9de9a
tree4bc16a615a35baaf2b482de81cd256a69067ff72
parent798183c54799fbe1e5a5bfabb3a8c0505ffd2149
parent374b105797c3d4f29c685f3be535c35f5689b30e
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>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_opregion.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_uncore.c