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-Tag: v3.1-rc1~230^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d52589b785404c944e734ecc4e1d42326197613c;p=pandora-kernel.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
Reading git-diff-tree failed