Linus Torvalds e15daf6cdf Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (25 commits)
  drm/radeon/kms: Convert R520 to new init path and associated cleanup
  drm/radeon/kms: Convert RV515 to new init path and associated cleanup
  drm: fix radeon DRM warnings when !CONFIG_DEBUG_FS
  drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ
  drm/r600: fix memory leak introduced with 64k malloc avoidance fix.
  drm/kms: make fb helper work for all drivers.
  drm/radeon/r600: fix offset handling in CS parser
  drm/radeon/kms/r600: fix forcing pci mode on agp cards
  drm/radeon/kms: fix for the extra pages copying.
  drm/radeon/kms/r600: add support for vline relocs
  drm/radeon/kms: fix some bugs in vline reloc
  drm/radeon/kms/r600: clamp vram to aperture size
  drm/kms: protect against fb helper not being created.
  drm/r600: get values from the passed in IB not the copy.
  drm: create gitignore file for radeon
  drm/radeon/kms: remove unneeded master create/destroy functions.
  drm/kms: start adding command line interface using fb.
  fb: change rules for global rules match.
  drm/radeon/kms: don't require up to 64k allocations. (v2)
  drm/radeon/kms: enable dac load detection by default.
  ...

Trivial conflicts in drivers/gpu/drm/radeon/radeon_asic.h due to adding
'->vga_set_state' function pointers.
2009-09-30 08:03:00 -07:00
..
2009-09-23 07:39:50 -07:00
2008-03-10 18:01:20 -07:00
2009-04-01 08:59:31 -07:00
2009-06-16 19:47:59 -07:00
2009-04-01 08:59:32 -07:00
2009-01-12 20:56:32 +01:00
2008-07-24 10:47:34 -07:00
2009-06-16 19:47:58 -07:00
2008-05-18 13:28:49 -07:00
2009-09-23 07:39:51 -07:00
2009-05-06 16:36:10 -07:00
2009-07-07 11:50:57 +09:00
2009-09-21 15:14:58 +02:00
2009-09-23 07:39:51 -07:00
2008-04-28 08:58:41 -07:00
2009-01-06 15:59:27 -08:00
2009-01-06 15:59:27 -08:00
2009-03-17 09:30:36 +09:00
2009-04-01 08:59:31 -07:00
2007-10-16 09:43:22 -07:00
2009-04-01 08:59:31 -07:00
2008-10-16 11:21:42 -07:00