From: Dave Airlie <airlied@redhat.com>
Date: Thu, 17 Feb 2011 03:56:35 +0000 (+1000)
Subject: Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into... 
X-Git-Tag: v2.6.38-rc6~25^2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=e138018e3593a6af9ad7680b68c23451587daf11

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

* 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next:
  drm/nouveau: fix suspend/resume on GPUs that don't have PM support
  drm/nouveau: flips/flipd need to always set 'evict' for move_accel_cleanup()
  drm/nv40: fix tiling-related setup for a number of chipsets
  drm/nouveau: fix non-EDIDful native mode selection
  drm/nouveau: Fix detection of DDC-based LVDS on DCB15 boards.
  drm/nv04-nv40: Fix NULL dereference when we fail to find an LVDS native mode.
  drm/nv10: Fix crash when allocating a BO larger than half the available VRAM.
---

e138018e3593a6af9ad7680b68c23451587daf11