Dave Airlie d6486813d2 Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-core-next ... * 'nouveau/for-airlied' of ../drm-nouveau-next: (77 commits) drm/nouveau: set TASK_(UN)INTERRUPTIBLE before schedule_timeout() drm/nv50: fix some not-error error messages drm/nouveau: introduce gpio engine drm/nv50: correct wait condition for instmem flush drm/nouveau: Fix TV-out detection on unposted cards lacking a usable DCB table. drm/nouveau: Get rid of the remaining VGA CRTC locking. drm/nouveau: Move display init to a new nouveau_engine. drm/nouveau: Put back the old 2-messages I2C slave test. drm/nouveau: Reset AGP before running the init scripts. drm/nv30: Init the PFB+0x3xx memory timing regs. drm/nouveau: disable hotplug detect around DP link training drm/nv50: add function to control GPIO IRQ reporting drm/nouveau: add nv_mask register accessor drm/nouveau: fix build without CONFIG_ACPI drm/nouveau: Reset CRTC owner to 0 before BIOS init. drm/nouveau: No need to lock/unlock the VGA CRTC regs all the time. drm/nouveau: Remove useless CRTC_OWNER logging. drm/nouveau: Add some generic I2C gadget detection code. drm/i2c/ch7006: Don't assume that the specified config points to static memory. drm/nv04-nv3x: Implement init-compute-mem. ... Conflicts: drivers/gpu/drm/nouveau/nouveau_bios.c		2010-08-02 10:31:47 +10:00
..
ch7006_drv.c	drm/i2c/ch7006: Don't assume that the specified config points to static memory.	2010-07-26 11:42:25 +10:00
ch7006_mode.c	drm/i2c/ch7006: Fix load detection false positives right after system init.	2009-12-16 17:04:45 +10:00
ch7006_priv.h	drm/i2c/ch7006: Don't assume that the specified config points to static memory.	2010-07-26 11:42:25 +10:00
Makefile	drm: Import driver for the sil164 I2C TMDS transmitter.	2010-08-02 10:21:13 +10:00
sil164_drv.c	drm: Import driver for the sil164 I2C TMDS transmitter.	2010-08-02 10:21:13 +10:00