diff options
author | Dave Airlie <airlied@redhat.com> | 2011-12-01 09:01:55 +0000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-01 09:01:55 +0000 |
commit | 4f3e0b1d33bfeb1e05e53073c6f277176ff9e368 (patch) | |
tree | e05876d05e2b6f30d94c5b46ed281dcb0f9c22a2 /drivers/gpu/drm/drm_dma.c | |
parent | 11d814a20166461358e1cefaf6bcd425698b8460 (diff) | |
parent | a55b68e06b593ef7311f4a1cf9d3ae349ef7e9ed (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/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
Diffstat (limited to 'drivers/gpu/drm/drm_dma.c')
0 files changed, 0 insertions, 0 deletions