From: Dave Airlie <airlied@redhat.com>
Date: Mon, 27 Jun 2011 08:10:59 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d52589b785404c944e734ecc4e1d42326197613c;p=~shefty%2Frdma-dev.git

Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next

* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: error paths leak in nvc0_graph_construct_context()
  drm/nouveau: Calculate reserved VRAM for PRAMIN value before use.
  drm/nouveau: fix nouveau_vma object leak
  drm/nouveau: fix nouveau_mem object leak
  drm/nouveau: fix fetching vbios from above 4GiB vram addresses
---

d52589b785404c944e734ecc4e1d42326197613c