| commit | 909d6e0cb6f947278e0479d67323d5bef6309a50 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Sep 09 09:10:04 2011 +0100 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Sep 09 09:10:04 2011 +0100 |
| tree | 2e3dc60965cfb90f05442c127160874fec4feeb6 | |
| parent | b06947b50053f2d21ad8ddf218cdb64fc8026896 [diff] | |
| parent | 0e83bb4eee1c504ab98367b4f7d1bc337ab213d2 [diff] |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-test * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nv04/crtc: Bail out if FB is not bound to crtc drm/nouveau: fix nv04_sgdma_bind on non-"4kB pages" archs drm/nouveau: properly handle allocation failure in nouveau_sgdma_populate drm/nouveau: fix oops on pre-semaphore hardware drm/nv50/crtc: Bail out if FB is not bound to crtc