]> git.baikalelectronics.ru Git - kernel.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)
commitbfbf6d48cc753adea8699ce26fccf4860282f0ae
tree9c029641a52ffc57d0244174bfd18edfd1759315
parentecfbe2310c0127cde4c40cdef0e9d1428a3d9474
parentad891af2cb04e06cb3ff38815844711d0fdd67b7
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.