Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...
authorDave Airlie <airlied@redhat.com>
Thu, 24 Feb 2011 22:40:26 +0000 (08:40 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 24 Feb 2011 22:40:26 +0000 (08:40 +1000)
commit3c0556e9673f79e386b27768e27d18b3ce29e40e
tree2fd33a82b46f27ff350c0de0b7b1c698c5b64c80
parentfbf92bea68830c12da9099d7c8a60812194efc4e
parent995073072c2ae72255b595b192cc63f43fd386ef
Merge branch 'drm-intel-fixes' of git://git./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