From: Dave Airlie <airlied@redhat.com>
Date: Mon, 11 Apr 2011 05:26:01 +0000 (+1000)
Subject: Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into... 
X-Git-Tag: v2.6.39-rc4~57^2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d85023a3cdb48ae127e431ec216c277ed7a3cb0f;p=~shefty%2Frdma-dev.git

Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes

* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
  drm/nvc0: improve vm flush function
  drm/nv50-nvc0: remove some code that doesn't belong here
  drm/nv50: use "nv86" tlb flush method on everything except 0x50/0xac
  drm/nouveau: quirk for XFX GT-240X-YA
  drm/nv50-nvc0: work around an evo channel hang that some people see
  drm/nouveau: implement init table opcode 0x5c
  drm/nouveau: fix oops on unload with disabled LVDS panel
  nv30: Fix parsing of perf table
  drm/nouveau: correct memtiming table parsing for nv4x
---

d85023a3cdb48ae127e431ec216c277ed7a3cb0f