]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@woody.osdl.org>
Fri, 12 Jan 2007 02:25:20 +0000 (18:25 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 12 Jan 2007 02:25:20 +0000 (18:25 -0800)
commit5b94d541806da24c8dbbff629486d65ce71dec46
tree9c029641a52ffc57d0244174bfd18edfd1759315
parente176d397ad73ca76936e5638c2c81740dedb9d5d
parenteac681b3aec226c83f52d307254d88393aab5eb9
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.