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)
commit2658770b2c3570106675d2e5581f4ae727523e0a
tree8d94dd0bd35310fc2ea178fb72d70f44d4f78c51
parentf8a9efb52847433c6a2e1598d78e49c42a9aa3c5
parent246a3d186a10266c9ee362e8d37c3bd851246b84
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: DRM: fix memset size error
  drm: remove remnants of DRM_COPY_FROM/TO_USER_IOCTL
  drm: remove second forward decleration of drm device struct.