From: Dave Airlie <airlied@redhat.com>
Date: Fri, 9 Sep 2011 08:10:04 +0000 (+0100)
Subject: Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=909d6e0cb6f947278e0479d67323d5bef6309a50;p=~shefty%2Frdma-dev.git

Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-test

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nv04/crtc: Bail out if FB is not bound to crtc
  drm/nouveau: fix nv04_sgdma_bind on non-"4kB pages" archs
  drm/nouveau: properly handle allocation failure in nouveau_sgdma_populate
  drm/nouveau: fix oops on pre-semaphore hardware
  drm/nv50/crtc: Bail out if FB is not bound to crtc
---

909d6e0cb6f947278e0479d67323d5bef6309a50