diff --git a/[refs] b/[refs]
index 7f5bd625110a..cc29c2fdfcd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a8bdcc7533b104d789d9bb3ed90da9352515e21
+refs/heads/master: aa5ed63e96656bb246a9439e06c7b67d455a5aa1
diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c
index 5d445f48789b..7c237e6ac711 100644
--- a/trunk/drivers/input/input.c
+++ b/trunk/drivers/input/input.c
@@ -1265,8 +1265,14 @@ static struct device_type input_dev_type = {
 	.uevent		= input_dev_uevent,
 };
 
+static char *input_nodename(struct device *dev)
+{
+	return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev));
+}
+
 struct class input_class = {
 	.name		= "input",
+	.nodename	= input_nodename,
 };
 EXPORT_SYMBOL_GPL(input_class);