From: Dave Airlie <airlied@redhat.com>
Date: Mon, 25 Jan 2010 06:04:11 +0000 (+1000)
Subject: Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus
X-Git-Tag: MMI-PSA29.97-13-9~25013^2~33
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8d586fe65a33b1a3a2a2539119248ce12f4bab50;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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()
---

8d586fe65a33b1a3a2a2539119248ce12f4bab50