Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 03:21:43 +0000 (20:21 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 03:21:43 +0000 (20:21 -0700)
commit82b6c3af0482c167fb3bb51375589e6d9c5c67a4
tree4ee4ed76faadb309b499187ea7ae797db69abfd3
parent9f4c7ac227423eb4a514ce0bbd3a884a26541e63
parent85abb3f95010b277a6efbc9b8031a7854af87e10
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