From: Dave Airlie <airlied@redhat.com>
Date: Tue, 7 Jun 2011 00:07:09 +0000 (+1000)
Subject: Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dcc32b838b449aef8533f130cfad41b912bfb228;p=linux-beck.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/nv40: fall back to paged dma object for the moment
  drm/nouveau: fix leak of gart mm node
  drm/nouveau: fix vram page mapping when crossing page table boundaries
  drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901).
  drm/nouveau: don't create accel engine objects when noaccel=1
  drm/nvc0: recognise 0xdX chipsets as NV_C0
---

dcc32b838b449aef8533f130cfad41b912bfb228