diff --git a/[refs] b/[refs]
index 92154bba46c5..66394051d177 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 544002ef832730b18327000c898a140bfc93efd4
+refs/heads/master: 5309809129ca3ab14f8bd5e5ef66c1b7686eb639
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 6de33d7a29ba..67c92582d6ef 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -284,6 +284,7 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
 
 	/* let the kset specific function add its keys */
 	pos = data;
+	memset(envp, 0, sizeof(envp));
 	retval = kset->uevent_ops->uevent(kset, &dev->kobj,
 					  envp, ARRAY_SIZE(envp),
 					  pos, PAGE_SIZE);