Linus Torvalds 03a2c4d76c Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* '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
2010-03-04 07:49:37 -08:00
..
2009-12-30 01:24:25 -05:00
2009-09-24 07:21:03 -07:00
2009-07-12 12:22:34 -07:00
2008-06-20 14:05:55 -06:00
2008-12-13 11:25:49 -08:00
2008-10-20 08:52:41 -07:00
2008-12-13 09:12:07 +00:00
2009-10-04 15:05:10 -07:00
2008-07-20 17:12:36 -07:00
2009-06-18 11:16:55 +10:00
2009-01-02 10:28:32 -08:00
2009-12-10 22:55:36 +01:00
2009-12-11 15:18:03 -08:00
2009-09-15 08:42:00 -07:00
2009-07-12 12:22:34 -07:00
2009-06-18 13:03:54 -07:00
2010-02-02 06:50:27 +11:00
2008-07-20 17:12:38 -07:00
2009-07-12 12:22:34 -07:00
2009-02-22 09:23:02 -08:00
2009-06-11 08:51:01 -07:00
2008-07-20 17:12:38 -07:00
2009-07-12 12:22:34 -07:00
2009-09-01 01:13:31 -07:00
2009-10-14 17:36:53 +02:00
2010-01-04 12:31:21 -08:00
2009-06-11 08:51:02 -07:00
2010-02-07 10:26:01 -08:00
2010-03-02 14:43:22 -08:00
2010-02-27 18:27:14 +01:00