diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 03:19:43 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 03:19:43 +0200 |
commit | 3e6dce76d99b328716b43929b9195adfee1de00c (patch) | |
tree | bb91c554cc1187aeb19f9965f539331dcae18f65 /arch/s390/include/asm | |
parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
parent | drm/i915: don't enable self-refresh on Ironlake (diff) | |
download | linux-3e6dce76d99b328716b43929b9195adfee1de00c.tar.xz linux-3e6dce76d99b328716b43929b9195adfee1de00c.zip |
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."
Diffstat (limited to 'arch/s390/include/asm')
0 files changed, 0 insertions, 0 deletions