diff --git a/[refs] b/[refs]
index 5e1319c145d0..5a32fe2fabb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81156928f8fe31621e467490b9d441c0285998c3
+refs/heads/master: 5dbdf7354821e00e4419ac3520d05d126857d56e
diff --git a/trunk/drivers/firmware/dell_rbu.c b/trunk/drivers/firmware/dell_rbu.c
index b4704e150b28..13946ebd77d6 100644
--- a/trunk/drivers/firmware/dell_rbu.c
+++ b/trunk/drivers/firmware/dell_rbu.c
@@ -576,7 +576,7 @@ static ssize_t read_rbu_image_type(struct kobject *kobj,
 {
 	int size = 0;
 	if (!pos)
-		size = scnprintf(buffer, count, "%s\n", image_type);
+		size = sprintf(buffer, "%s\n", image_type);
 	return size;
 }
 
@@ -648,7 +648,7 @@ static ssize_t read_rbu_packet_size(struct kobject *kobj,
 	int size = 0;
 	if (!pos) {
 		spin_lock(&rbu_data.lock);
-		size = scnprintf(buffer, count, "%lu\n", rbu_data.packetsize);
+		size = sprintf(buffer, "%lu\n", rbu_data.packetsize);
 		spin_unlock(&rbu_data.lock);
 	}
 	return size;
diff --git a/trunk/drivers/regulator/wm8400-regulator.c b/trunk/drivers/regulator/wm8400-regulator.c
index 48b372e038a8..56e23d44ba59 100644
--- a/trunk/drivers/regulator/wm8400-regulator.c
+++ b/trunk/drivers/regulator/wm8400-regulator.c
@@ -289,7 +289,7 @@ static struct regulator_desc regulators[] = {
 	},
 };
 
-static int __init wm8400_regulator_probe(struct platform_device *pdev)
+static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
 {
 	struct regulator_dev *rdev;
 
diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c
index b1ec3b4ee17d..e9335e1c6cf5 100644
--- a/trunk/security/keys/keyctl.c
+++ b/trunk/security/keys/keyctl.c
@@ -270,7 +270,6 @@ long keyctl_join_session_keyring(const char __user *_name)
 
 	/* join the session */
 	ret = join_session_keyring(name);
-	kfree(name);
 
  error:
 	return ret;