From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 26 Oct 2006 03:21:43 +0000 (-0700)
Subject: Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=82b6c3af0482c167fb3bb51375589e6d9c5c67a4;p=deliverable%2Flinux.git

Merge branch 'drm-patches' of /linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: ioremap balanced with iounmap for drivers/char/drm
  drm: fix error returns, sysfs error handling
  fix return code in error case.
  drm: mga: set dev_priv_size
  drm: savage: dev->agp_buffer_map is not initialized for AGP DMA on savages
  drm: radeon: only allow specific type-3 packetss through verifier
---

82b6c3af0482c167fb3bb51375589e6d9c5c67a4