Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2009 22:32:30 +0000 (14:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2009 22:32:30 +0000 (14:32 -0800)
commit9148bce4a7d7b532e49a3bc546f1703a58dfad45
treea65ef51984b437034d76b639aafa8ca9c1df0db7
parentaad3bf04dca5a2147a8406f7aef5703ee5259a52
parentd1ede145cea25c5b6d2ebb19b167af14e374bb45
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: export some functions useful to drivers using ttm
  drm/radeon/kms/avivo: fix typo in new_pll module description
  drm/radeon/kms: Convert radeon to new ttm_bo_init
  drm/ttm: Convert ttm_buffer_object_init to use ttm_placement