tree e05876d05e2b6f30d94c5b46ed281dcb0f9c22a2
parent 11d814a20166461358e1cefaf6bcd425698b8460
parent a55b68e06b593ef7311f4a1cf9d3ae349ef7e9ed
author Dave Airlie <airlied@redhat.com> 1322730115 +0000
committer Dave Airlie <airlied@redhat.com> 1322730115 +0000

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/nv50/disp: silence compiler warning
  drm/nouveau: fix oopses caused by clear being called on unpopulated ttms
  drm/nouveau: Keep RAMIN heap within the channel.
  drm/nvd0/disp: fix sor dpms typo, preventing dpms on in some situations
  drm/nvc0/gr: fix TP init for transform feedback offset queries
  drm/nouveau: add dumb ioctl support