From: Dave Airlie <airlied@redhat.com>
Date: Mon, 15 Mar 2010 01:07:33 +0000 (+1000)
Subject: Merge remote branch 'nouveau/for-airlied' into drm-linus
X-Git-Tag: v2.6.34-rc4~88^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5e5deddf67389eabc3d9b13004c108120d397e1;p=pandora-kernel.git

Merge remote branch 'nouveau/for-airlied' into drm-linus

* nouveau/for-airlied:
  drm/nouveau: add module option to disable TV detection
  drm/nouveau: Never evict VRAM buffers to system.
  drm/nv50: fix connector table parsing for some cards
  drm/nv50: add a memory barrier to pushbuf submission
  drm/nouveau: print a message very early during suspend
  drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay.
  drm/nouveau: Gigabyte NX85T connector table lies, it has DVI-I not HDMI
  drm/nouveau: add option to allow override of dcb connector table types
  drm/nv50: Improve PGRAPH interrupt handling.
  drm/nv50: Make ctxprog wait until interrupt handler is done.
  drm/nouveau: Fix fbcon corruption with font width not divisible by 8
  drm/nv50: Remove redundant/incorrect ctxvals initialisation.
---

d5e5deddf67389eabc3d9b13004c108120d397e1
Reading git-diff-tree failed