From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 15 Oct 2007 15:17:26 +0000 (-0700)
Subject: Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie... 
X-Git-Tag: v2.6.24-rc1~1292
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=13626cb91f41df803c54047172bfc7a716e36c2b;p=linux.git

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

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  via invalid device ids removal
  radeon: Commit the ring after each partial texture upload blit.
  i915: fix vbl swap allocation size.
  drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.
  drm: remove XFREE86_VERSION macros.
  drm: Replace filp in ioctl arguments with drm_file *file_priv.
  drm: Remove DRM_ERR OS macro.
---

13626cb91f41df803c54047172bfc7a716e36c2b