summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-13 23:04:26 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-13 23:04:26 +0200
commitc835490196c42d9f225ee6873880f436d031df86 (patch)
tree84ad9113d7733678a7556b6d976f034fc046435f /scripts
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentdrm/radeon/kms/evergreen: emit SQ_LDS_RESOURCE_MGMT for blits (diff)
downloadlinux-c835490196c42d9f225ee6873880f436d031df86.tar.xz
linux-c835490196c42d9f225ee6873880f436d031df86.zip
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms/evergreen: emit SQ_LDS_RESOURCE_MGMT for blits agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M drm/radeon/kms: fix typo in read_disabled vbios code drm/radeon/kms: use correct BUS_CNTL reg on rs600 drm/radeon/kms: fix backend map typo on juniper drm/radeon/kms: fix regression in hotplug
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions