commit 5335a40be6867eff986a31bcd8fc82a5cb1e16bb
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue May 08 11:52:35 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue May 08 11:52:35 2007 -0700
tree b32be59c2a2679a5cc3fef172006886f7dcd2466
parent 393bfca19ecdce60a8d9a4d2577cac11ca924a25
parent ef68d295508d52e792abf70d4f84461104d33b9d

Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
  via: Make sure we flush write-combining using a follow-up read.
  via: Try to improve command-buffer chaining.
  drm: remove old taskqueue remnant
  drm: rename badly named define and cleanup ioctl code spacing
  radeon: Don't mess up page flipping when a file descriptor is closed.
  drm/radeon: upgrade to 1.27 - make PCI GART more flexible