Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 6 Nov 2007 01:43:36 +0000 (17:43 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 6 Nov 2007 01:43:36 +0000 (17:43 -0800)
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: DRM: fix memset size error
  drm: remove remnants of DRM_COPY_FROM/TO_USER_IOCTL
  drm: remove second forward decleration of drm device struct.


Trivial merge