drm: drm_ioctl.c sync with fixes from CVS
authorDave Airlie <airlied@starflyer.(none)>
Mon, 2 Jan 2006 10:19:39 +0000 (21:19 +1100)
committerDave Airlie <airlied@linux.ie>
Mon, 2 Jan 2006 10:19:39 +0000 (21:19 +1100)
Apply the fixes from CVS that were outstanding for this file

Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/drm_ioctl.c

Simple merge