diff --git a/[refs] b/[refs]
index 81c59c41f147..3849a4fdf2a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 710224fa2750cf449c02dd115548acebfdd2c86a
+refs/heads/master: d544b7a40ad3423676b8876aad64fc5f87296b2d
diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig
index 0b591b658243..b74331260744 100644
--- a/trunk/drivers/misc/Kconfig
+++ b/trunk/drivers/misc/Kconfig
@@ -368,7 +368,7 @@ config VMWARE_BALLOON
 	  If unsure, say N.
 
 	  To compile this driver as a module, choose M here: the
-	  module will be called vmware_balloon.
+	  module will be called vmw_balloon.
 
 config ARM_CHARLCD
 	bool "ARM Ltd. Character LCD Driver"
diff --git a/trunk/drivers/misc/Makefile b/trunk/drivers/misc/Makefile
index 255a80dc9d73..42eab95cde2a 100644
--- a/trunk/drivers/misc/Makefile
+++ b/trunk/drivers/misc/Makefile
@@ -33,5 +33,5 @@ obj-$(CONFIG_IWMC3200TOP)      += iwmc3200top/
 obj-$(CONFIG_HMC6352)		+= hmc6352.o
 obj-y				+= eeprom/
 obj-y				+= cb710/
-obj-$(CONFIG_VMWARE_BALLOON)	+= vmware_balloon.o
+obj-$(CONFIG_VMWARE_BALLOON)	+= vmw_balloon.o
 obj-$(CONFIG_ARM_CHARLCD)	+= arm-charlcd.o
diff --git a/trunk/drivers/misc/vmware_balloon.c b/trunk/drivers/misc/vmw_balloon.c
similarity index 100%
rename from trunk/drivers/misc/vmware_balloon.c
rename to trunk/drivers/misc/vmw_balloon.c