Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2...
authorDave Airlie <airlied@redhat.com>
Mon, 2 Apr 2012 09:45:03 +0000 (10:45 +0100)
committerDave Airlie <airlied@redhat.com>
Mon, 2 Apr 2012 09:45:03 +0000 (10:45 +0100)
commite0d2e320210a0e0a75110bad8501b1cd498221de
treeba8bf718645591c2638fc7fbb4c55454d94e0801
parentdd775ae2549217d3ae09363e3edb305d0fa19928
parent02bfc2881e0d5b23147211bb6420798d946a7b5c
Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

* 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: inform userspace of relaxed kernel subchannel requirements
  Revert "drm/nouveau: inform userspace of new kernel subchannel requirements"
  drm/nouveau: oops, create m2mf for nvd9 too