commit 13626cb91f41df803c54047172bfc7a716e36c2b
author Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Oct 15 08:17:26 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Oct 15 08:17:26 2007 -0700
tree d1e24385eaad0637ce388743310471e20f0839d8
parent 37ca506adc395a028cd12760eca419dd0dc14b5c
parent ace3dff5b7f0bf5a647e60dcd0c0a7d46792f5d9

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.