From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Nov 2010 18:28:13 +0000 (-0800)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle... 
X-Git-Tag: v2.6.37-rc3~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=973d168de251d46605dc00d2c7f83848a5af9fb9;p=~emulex%2Finfiniband.git

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  drm/i915: Disable FBC on Ironlake to save 1W
  drm/i915: Take advantage of auto-polling CRT hotplug detection on PCH hardware
  drm/i915/crt: Introduce struct intel_crt
  drm/i915: Do not hold mutex when faulting in user addresses
  drm: radeon: fix error value sign
  drm/radeon/kms: fix and unify tiled buffer alignment checking for r6xx/7xx
  drm/i915: Retire any pending operations on the old scanout when switching
  drm/i915: Fix I2C adapter registration
---

973d168de251d46605dc00d2c7f83848a5af9fb9