From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Apr 2012 09:45:03 +0000 (+0100)
Subject: Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2... 
X-Git-Tag: MMI-PSA29.97-13-9~17071^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e0d2e320210a0e0a75110bad8501b1cd498221de;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

e0d2e320210a0e0a75110bad8501b1cd498221de