| commit | 8cb3ed17cb88f2f1fe1cf36c8d48bccd4d9f459e | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 12 Sep 2011 20:49:07 +0000 (12 13:49 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 12 Sep 2011 20:49:07 +0000 (12 13:49 -0700) | ||
| tree | 395fd7158b16af6619d8611534145d3e4bf20a7b | treesnapshot (tar.gz zip) |
| parent | 4c7527821c125c76432c30c8781667f55bed600c | commitdiff |
| parent | 55a01f6f6840b6310b073afabda649727d2ddb24 | commitdiff |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm: Remove duplicate "return" statement
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
drm/radeon/kms: fix DP detect and EDID fetch for DP bridges
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm: Remove duplicate "return" statement
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
drm/radeon/kms: fix DP detect and EDID fetch for DP bridges