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)
* '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


Trivial merge