Dave Airlie 51c8b4071d Merge Linus master to drm-next ...

linux-next conflict reported needed resolution.

Conflicts:
	drivers/gpu/drm/drm_crtc.c
	drivers/gpu/drm/drm_edid.c
	drivers/gpu/drm/i915/intel_sdvo.c
	drivers/gpu/drm/radeon/radeon_ttm.c
	drivers/gpu/drm/ttm/ttm_bo.c

2009-08-20 13:38:04 +10:00

..

ttm

Merge Linus master to drm-next

2009-08-20 13:38:04 +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: Hook up DPMS property handling in drm_crtc.c. Add drm_helper_connector_dpms.

2009-06-04 09:32:12 +10:00

drm_crtc.h

drm: Add more standard TV properties.

2009-08-13 10:33:48 +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_hashtab.h

drm: include kernel list header file in hashtab header

2009-06-12 15:56:34 +10:00

drm_memory.h

drm: reorganise drm tree to be more future proof.

2008-07-14 10:45:01 +10:00

drm_mm.h

drm: Apply "Memory fragmentation from lost alignment blocks"

2009-06-19 09:01:12 +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/radeon: Add support for RS880 chips

2009-08-05 12:07:09 +10: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: Add the explanation about DRM debug level

2009-08-04 14:02:41 +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: Add new GET_PIPE_FROM_CRTC_ID ioctl.

2009-05-14 16:00:32 -07: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: implement bo busy check + current domain

2009-08-17 12:28:56 +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