| commit | 3c0556e9673f79e386b27768e27d18b3ce29e40e | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Feb 25 08:40:26 2011 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Feb 25 08:40:26 2011 +1000 |
| tree | 2fd33a82b46f27ff350c0de0b7b1c698c5b64c80 | |
| parent | fbf92bea68830c12da9099d7c8a60812194efc4e [diff] | |
| parent | 995073072c2ae72255b595b192cc63f43fd386ef [diff] |
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