Fixup 2.6.11.3 merge by hand.

diff --git a/Makefile b/Makefile
index f9e13d7b9fdb1b88497903c567b98f800415f5f6..fbe0fd77b5dcd0cbe2b075b6f9e68cab428529bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 11
-EXTRAVERSION = .3
+EXTRAVERSION =
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*

diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
index 4a8d33bb8cfb359cc0156fcb44763d4c32db99e4..39afda0ccabe36d803e5bc89772d4b19edec6d94 100644 (file)
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
@@ -328,8 +328,6 @@ int drm_setversion(DRM_IOCTL_ARGS)
 
        memset(&version, 0, sizeof(version));
 
-       memset(&version, 0, sizeof(version));
-
        dev->driver->version(&version);
        retv.drm_di_major = DRM_IF_MAJOR;
        retv.drm_di_minor = DRM_IF_MINOR;