tree 84ad9113d7733678a7556b6d976f034fc046435f
parent 5d7d5d933256fc44f68e061ccd103b027fef0fc9
parent c61d0af9131976db150c40996a71387ba59edb67
author Linus Torvalds <torvalds@linux-foundation.org> 1310591066 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310591066 -0700

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