From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 17 Apr 2012 09:13:03 +0000 (+0200)
Subject: Merge tag 'v3.4-rc3' into drm-intel-next-queued
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=767878908e7cc28c440c5431f6591157d8bd4ae7;p=linux-beck.git

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

Backmerge Linux 3.4-rc3 into drm-intel-next to resolve a few things
that conflict/depend upon patches in -rc3:
- Second part of the Sandybridge workaround series - it changes some
  of the same registers.
- Preparation for Chris Wilson's fencing cleanup - we need the fix
  from -rc3 merged before we can move around all that code.
- Resolve the gmbus conflict - gmbus has been disabled in 3.4 again,
  but should be enabled on all generations in 3.5.

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

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

767878908e7cc28c440c5431f6591157d8bd4ae7