diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-25 16:04:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-25 16:04:11 +1000 |
| commit | 8d586fe65a33b1a3a2a2539119248ce12f4bab50 (patch) | |
| tree | 05b20c54ec304069002358c7e7682237099ff5d2 /drivers/rapidio | |
| parent | 1a961ce09fe39df9a1b796df98794fd32c76c413 (diff) | |
| parent | 162265367a96d381f07066581d65e52627b08618 (diff) | |
Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus
* 'nouveau/for-airlied' of ../drm-nouveau-next:
drm/nv50: prevent switching off SOR when in use for DVI-over-DP
drm/nv50: fail auxch transaction if reply count not what we expect
drm/nouveau: fix failure path if userspace specifies no valid memtypes
drm/nouveau: report LVDS as disconnected if lid closed
drm/nv50: prevent accidently turning off encoders we're actually using
drm/nv50: fix alignment of per-channel fifo cache
drm/nouveau: Evict buffers in VRAM before freeing sgdma
drm/nouveau: Acknowledge DMA_VTX_PROTECTION PGRAPH interrupts
drm/nouveau: fix thinko in nv04_instmem.c
drm/nouveau: fix a race condition in nouveau_dma_wait()
Diffstat (limited to 'drivers/rapidio')
0 files changed, 0 insertions, 0 deletions