Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 01:24:37 +0000 (18:24 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 01:24:37 +0000 (18:24 -0700)
* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: convert drawable code to using idr
  drm: convert drm context code to use Linux idr


Trivial merge