Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Oct 2010 20:47:20 +0000 (13:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Oct 2010 20:47:20 +0000 (13:47 -0700)
commitdda9cd9fb30dfe6f2a51a394c18aef7c401b497d
treed969967eae1d2d7c00c7f8b3de802eee9a5d19fa
parentafe147466c8f22a69eb470ab504608a9f4ae3345
parentdab8dcfa3c8e3b021a138bee7c17791b4991ba55
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: don't drop handle reference on unload
  drm/ttm: Fix two race conditions + fix busy codepaths