From: Linus Torvalds Date: Tue, 17 Jul 2007 01:24:37 +0000 (-0700) Subject: Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie... X-Git-Tag: v2.6.23-rc1~766 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a5fcaa210626a79465321e344c91a6a7dc3881fa;p=linux.git 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 --- a5fcaa210626a79465321e344c91a6a7dc3881fa