From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 18 Apr 2006 17:49:11 +0000 (-0700)
Subject: Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.17-rc2~8
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=ac69e973ff0660e455f4ba1ddd4dcce4ae70ed1a;p=powerpc.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:
  drm: Fix further issues in drivers/char/drm/via_irq.c
  drivers/char/drm/drm_memory.c: possible cleanups
  drm: deline a few large inlines in DRM code
  drm: remove master setting from add/remove context
  drm: drm_pci needs dma-mapping.h
  [PATCH] drm: Fix issue reported by Coverity in drivers/char/drm/via_irq.c
---

ac69e973ff0660e455f4ba1ddd4dcce4ae70ed1a