diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 19:42:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 19:42:43 -0400 |
| commit | 6467a71c56934251f3c917bd4386387c2a97b41e (patch) | |
| tree | 09f930fda8c6c555d488971d76e728846be55650 /drivers/char/cyclades.c | |
| parent | 18020a0d8cccad0d3642219d6aef789420c04c1f (diff) | |
| parent | 6e6c822868f113dabe3c33bdd91e883cc28fa11b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: Stop trying to use ACPI lid status to determine LVDS connection.
drm/intel: fix up set_tiling for untiled->tiled transition
drm/i915: Set up the documented clock gating on Sandybridge and Ironlake.
agp/intel: Don't do the chipset flush on Sandybridge.
agp/intel: Respect the GTT size on Sandybridge for scratch page setup.
drm/i915: fix small leak on overlay error path
drm/i915: Avoid NULL deref in get_pages() unwind after error.
drm/i915: Fix check with IS_GEN6
drivers/gpu/drm/i915/intel_bios.c: fix continuation line formats
drm/i915: Enable VS timer dispatch.
drm/i915: Rename FBC_C3_IDLE to FBC_CTL_C3_IDLE to match other registers
drm/i915: remove an unnecessary wait_request()
drm/i915: Don't bother with the BKL for GEM ioctls.
Diffstat (limited to 'drivers/char/cyclades.c')
0 files changed, 0 insertions, 0 deletions