| commit | 3e6dce76d99b328716b43929b9195adfee1de00c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 10 18:19:43 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 10 18:19:43 2010 -0700 |
| tree | bb91c554cc1187aeb19f9965f539331dcae18f65 | |
| parent | fbc1487019d287bd869baac846dee97f39f8f07c [diff] | |
| parent | dd8849c8f59ec1cee4809a0c5e603e045abe860e [diff] |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915: don't enable self-refresh on Ironlake drm/i915: Double check that the wait_request is not pending before warning Revert "drm/i915: Warn if we run out of FIFO space for a mode" Revert "drm/i915: Allow LVDS on pipe A on gen4+" Revert "drm/i915: Enable RC6 on Ironlake."