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
..
ttm	Merge Linus master to drm-next	2009-08-20 13:38:04 +10:00
drm_cache.h	drm/ttm: consolidate cache flushing code in one place.	2009-08-27 09:53:47 +10:00
drm_core.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
drm_crtc_helper.h	drm/kms: make fb helper work for all drivers.	2009-09-28 15:31:10 +10:00
drm_crtc.h	drm/kms: start adding command line interface using fb.	2009-09-25 13:08:20 +10:00
drm_edid.h	drm: Fix shifts which were miscalculated when converting from bitfields.	2009-06-24 16:11:04 +10:00
drm_encoder_slave.h	drm/kms: no need to return void value (encoder)	2009-08-19 16:06:49 +10:00
drm_fb_helper.h	drm/kms: start adding command line interface using fb.	2009-09-25 13:08:20 +10:00
drm_hashtab.h	drm: include kernel list header file in hashtab header	2009-06-12 15:56:34 +10:00
drm_memory.h	includecheck fix: include/drm, drm_memory.h	2009-09-20 16:02:58 +05:30
drm_mm.h	drm: include seq_file.h for debugfs builds.	2009-09-08 11:32:08 +10:00
drm_mode.h	drm: clarify scaling property names	2009-08-19 16:06:40 +10:00
drm_os_linux.h	drm: fix missing inline function on 32-bit powerpc.	2009-04-03 09:07:07 +10:00
drm_pciids.h	drm/i915: add B43 chipset support	2009-09-08 23:33:26 -07:00
drm_sarea.h	drm: move to kref per-master structures.	2008-12-29 17:47:22 +10:00
drm_sman.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
drm_sysfs.h	drm: Enable drm drivers to add drm sysfs devices.	2009-08-19 16:08:51 +10:00
drm.h	make drm headers use strict integer types	2009-03-26 18:14:18 +01:00
drmP.h	drm/vgaarb: add VGA arbitration support to the drm and kms.	2009-09-21 15:00:27 +10:00
i810_drm.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
i830_drm.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
i915_drm.h	drm/i915: Track purged state.	2009-09-23 01:10:38 +01:00
Kbuild	DRM: add mode setting support	2008-12-29 17:47:23 +10:00
mga_drm.h	make drm headers use strict integer types	2009-03-26 18:14:18 +01:00
r128_drm.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
radeon_drm.h	drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.	2009-09-18 16:01:59 +10:00
savage_drm.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
sis_drm.h	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
via_drm.h	make drm headers use strict integer types	2009-03-26 18:14:18 +01:00