From: Dave Airlie <airlied@redhat.com>
Date: Sun, 9 Jan 2011 23:23:49 +0000 (+1000)
Subject: Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core... 
X-Git-Tag: Ubuntu-5.2.0-15.16~22656^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7ad7f87b87f4480b989af37488511ed08559a98b;p=mirror_ubuntu-eoan-kernel.git

Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core-next

* 'nouveau/drm-nouveau-next' of ../drm-nouveau-next:
  drm/nouveau: fix hwmon device binding
  drm/nouveau: create grctx on the fly on all chipsets
  drm/nvc0: fix init without firmware present
  drm/nvc0/pgraph: fix 0x406028/0x405870 init
  drm/nvc0/pgraph: more unit names
  drm/nvc0/pfifo: support for chipsets with only one PSUBFIFO (0xc1)
  drm/nvc0: reserve only subc 0 for kernel use
  drm/nv50: sync up gr data error names with rnn, use for nvc0 also
  drm/nvc0: parse a couple more PGRAPH_INTR
  drm/nvc0: nuke left-over debug messages
  drm/nvc0: kill off a couple more magics
  drm/nouveau: Validate channel indices passed from userspace.
  drm/nouveau: Only select ACPI_VIDEO if its dependencies are met
---

7ad7f87b87f4480b989af37488511ed08559a98b