| commit | e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 07 14:02:01 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 07 14:02:01 2010 -0700 |
| tree | 72f361fec4a8c81d5003b93344bf3eab3eb21775 | |
| parent | e2dbe06c271f3bb2a495627980aad3d1d8ccef2a [diff] | |
| parent | 8cfe92d683a0041ac8e016a0b0a487c99a78f6c1 [diff] |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/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