From: Dave Airlie <airlied@redhat.com>
Date: Mon, 17 Jan 2011 02:20:31 +0000 (+1000)
Subject: Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into... 
X-Git-Tag: v5.15~26691^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=51fda92223f5b668cccffd51bf3d7bedc93609ff;p=mirror_ubuntu-kernels.git

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 gpu page faults triggered by plymouthd
  drm/nouveau: greatly simplify mm, killing some bugs in the process
  drm/nvc0: enable protection of system-use-only structures in vm
  drm/nv40: initialise 0x17xx on all chipsets that have it
  drm/nv40: make detection of 0x4097-ful chipsets available everywhere
---

51fda92223f5b668cccffd51bf3d7bedc93609ff