tree 2fd33a82b46f27ff350c0de0b7b1c698c5b64c80
parent fbf92bea68830c12da9099d7c8a60812194efc4e
parent 995073072c2ae72255b595b192cc63f43fd386ef
author Dave Airlie <airlied@redhat.com> 1298587226 +1000
committer Dave Airlie <airlied@redhat.com> 1298587226 +1000

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