summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-12 13:49:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-12 13:49:07 -0700
commit8cb3ed17cb88f2f1fe1cf36c8d48bccd4d9f459e (patch)
tree395fd7158b16af6619d8611534145d3e4bf20a7b /kernel
parent4c7527821c125c76432c30c8781667f55bed600c (diff)
parent55a01f6f6840b6310b073afabda649727d2ddb24 (diff)
downloadlinux-8cb3ed17cb88f2f1fe1cf36c8d48bccd4d9f459e.tar.bz2
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions