From: Linus Torvalds <torvalds@woody.osdl.org>
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: firefly_0821_release~31542
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b94d541806da24c8dbbff629486d65ce71dec46;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-patches' of git://git./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