| commit | e0d2e320210a0e0a75110bad8501b1cd498221de | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Apr 02 10:45:03 2012 +0100 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Apr 02 10:45:03 2012 +0100 |
| tree | ba8bf718645591c2638fc7fbb4c55454d94e0801 | |
| parent | dd775ae2549217d3ae09363e3edb305d0fa19928 [diff] | |
| parent | 02bfc2881e0d5b23147211bb6420798d946a7b5c [diff] |
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