]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
* '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


Trivial merge