• Linus Torvalds's avatar
    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 03a2c4d7
    Linus Torvalds authored
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits)
      vga_switcheroo: disable default y by new rules.
      drm/nouveau: fix *staging* driver build with switcheroo off.
      drm/radeon: fix typo in Makefile
      vga_switcheroo: fix build on platforms with no ACPI
      drm/radeon: Fix printf type warning in 64bit system.
      drm/radeon/kms: bump the KMS version number for square tiling support.
      vga_switcheroo: initial implementation (v15)
      drm/radeon/kms: do not disable audio engine twice
      Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730"
      drm/radeon/kms: do not preset audio stuff and start timer when not using audio
      drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond
      drm/ttm: fix function prototype to match implementation
      drm/radeon: use ALIGN instead of open coding it
      drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
      drm/i915: Use a dmi quirk to skip a broken SDVO TV output.
      drm/i915: enable/disable LVDS port at DPMS time
      drm/i915: check for multiple write domains in pin_and_relocate
      drm/i915: clean-up i915_gem_flush_gpu_write_domain
      drm/i915: reuse i915_gpu_idle helper
      drm/i915: ensure lru ordering of fence_list
      ...
    
    Fixed trivial conflicts in drivers/gpu/vga/Kconfig
    03a2c4d7
Name
Last commit
Last update
..
drm Loading commit data...
vga Loading commit data...
Makefile Loading commit data...