Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 21:31:49 +0000 (13:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 21:31:49 +0000 (13:31 -0800)
commitc3606c60a91969cc42c12bae71a022ca56de83d2
tree22de63dfb8c66783577c209669295e2dd339dd9f
parentd5f04ff5fba75e3e9607a65f46cfbfbdf8d69ce4
parentf3886f85cfde578f1d0ba6e40ac5f9d70043923b
Merge branch 'drm-fixes' of git://git./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: don't apply 7xx HDP flush workaround on AGP
  drm: use after free in drm_queue_vblank_event()
  drm/kms: remove spaces from connector names (v2)