From: Dave Airlie <airlied@redhat.com>
Date: Mon, 6 Jun 2011 23:54:04 +0000 (+1000)
Subject: Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
X-Git-Tag: v3.0-rc3~41^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de52bcab836e6ad21bb0c03c6030725044b2819e;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes

* 'keithp/drm-intel-fixes' of /ssd/git/drm-next:
  drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007
  drm/i915: Share the common force-audio property between connectors
  drm/i915: Remove unused enum "chip_family"
  drm/915: fix relaxed tiling on gen2: tile height
  drm/i915/crt: Explicitly return false if connected to a digital monitor
  drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0
  drm/i915: Only print out the actual number of fences for i915_error_state
  drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/
  drm: i915: correct return status in intel_hdmi_mode_valid()
  drm/i915: fix regression after clock gating init split
  drm/i915: fix if statement in ivybridge irq handler
---

de52bcab836e6ad21bb0c03c6030725044b2819e