tree 8b42dc877829cead9a38fbda664b4c9d3c071fc4
parent 489de30259e667d7bc47da9da44a0270b050cd97
parent d4e2cbe9cb9219fc924191a6baa2369140cb5ea8
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184635477 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184635477 -0700

Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/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