tree 079826480a861b5d02e314248e51d69a9a7b8dfa
parent 102e41fd9dfee357b71e21a38eec3c86ff557bc1
parent d253258c80117c2afaa644554e613201992e4ee9
author Linus Torvalds <torvalds@g5.osdl.org> 1145382551 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1145382551 -0700

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:
  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