From: Dave Airlie <airlied@redhat.com>
Date: Thu, 24 Feb 2011 22:40:26 +0000 (+1000)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle... 
X-Git-Tag: v2.6.38-rc7~37^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3c0556e9673f79e386b27768e27d18b3ce29e40e;p=users%2Fmchehab%2Fedac.git

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

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  drm/i915: Fix unintended recursion in ironlake_disable_rc6
---

3c0556e9673f79e386b27768e27d18b3ce29e40e