From: Linus Torvalds Date: Fri, 12 Jan 2007 02:25:20 +0000 (-0800) Subject: Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Tag: v2.6.20-rc5~4 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5b94d541806da24c8dbbff629486d65ce71dec46;p=linux-2.6-omap-h63xx.git Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: i915: Fix a DRM_ERROR that should be DRM_DEBUG. --- 5b94d541806da24c8dbbff629486d65ce71dec46