Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie...
commita5fcaa210626a79465321e344c91a6a7dc3881fa
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 01:24:37 +0000 (16 18:24 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 01:24:37 +0000 (16 18:24 -0700)
tree8b42dc877829cead9a38fbda664b4c9d3c071fc4
parent489de30259e667d7bc47da9da44a0270b050cd97
parentd4e2cbe9cb9219fc924191a6baa2369140cb5ea8
Merge branch 'drm-patches' of ssh:///linux/kernel/git/airlied/drm-2.6

* '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