From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 May 2010 21:02:01 +0000 (-0700)
Subject: Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.34-rc7~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/ttm: Remove the ttm_bo_block_reservation() function.
  drm/ttm: Remove some leftover debug messages.
  drm/radeon: async event synchronization for drmWaitVblank
---

e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7