From: Dave Airlie <airlied@redhat.com>
Date: Tue, 7 Feb 2012 15:29:04 +0000 (+0000)
Subject: Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into... 
X-Git-Tag: v3.4-rc1~143^2~98
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=198ceac091049003ffcc4b7cda76785510fc3b59;p=karo-tx-linux.git

Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

* 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: add a LLC feature flag in device description
  drm/i915: kill i915_mem.c
  drm/i915: Use kcalloc instead of kzalloc to allocate array
  drm/i915/dp: Check for AUXCH error before checking for success
  drm/i915/dp: Use auxch precharge value of 5 everywhere
  drm/i915/dp: Tweak auxch clock divider for PCH
  drm/i915: Remove a comment about PCH from the non-PCH path
  drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP)
  drm/i915: Implement plane-disabled assertion for PCH too
  drivers: i915: Fix BLC PWM register setup
  drm/i915: Check that plane/pipe is disabled before removing the fb
  drm/i915: fix typo in function name
  drm/i915: split out pll divider code
  drm/i915: split 9xx refclk & sdvo tv code out
  agp/intel: Add pci id for hostbridge from has/qemu
  drm/i915: there is no pipe CxSR on ironlake
  drm/i915: Only look for matching clocks for LVDS downclock
  drm/i915: Silence _DSM errors
---

198ceac091049003ffcc4b7cda76785510fc3b59