tree 9c029641a52ffc57d0244174bfd18edfd1759315
parent e176d397ad73ca76936e5638c2c81740dedb9d5d
parent eac681b3aec226c83f52d307254d88393aab5eb9
author Linus Torvalds <torvalds@woody.osdl.org> 1168568720 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1168568720 -0800

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.