diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-02 04:31:47 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 04:31:47 +0400 |
| commit | d6486813d2d0658c34f62212ba9a64be4d01c317 (patch) | |
| tree | 2fac929ee406d4b5612db89a643430a3f94742ee /drivers/cdrom | |
| parent | 7827627107aeb629f1a056cb56b17bd4fb789e03 (diff) | |
| parent | 05991110cf94117dd488f6d64dabdea56ff35107 (diff) | |
| download | linux-d6486813d2d0658c34f62212ba9a64be4d01c317.tar.xz | |
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
Diffstat (limited to 'drivers/cdrom')
0 files changed, 0 insertions, 0 deletions