diff --git a/[refs] b/[refs]
index fae46fde2770..d8613364f8fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce09affc59bca2a1ac1f77b75915fd914fab1f70
+refs/heads/master: 9b8872273af6983b246252a6508fa7cf34c69d6e
diff --git a/trunk/drivers/power/power_supply_sysfs.c b/trunk/drivers/power/power_supply_sysfs.c
index 58cc4906d216..939e2e432553 100644
--- a/trunk/drivers/power/power_supply_sysfs.c
+++ b/trunk/drivers/power/power_supply_sysfs.c
@@ -42,7 +42,7 @@ static ssize_t power_supply_show_property(struct device *dev,
 					  struct device_attribute *attr,
 					  char *buf) {
 	static char *type_text[] = {
-		"Battery", "UPS", "Mains", "USB",
+		"Unknown", "Battery", "UPS", "Mains", "USB",
 		"USB_DCP", "USB_CDP", "USB_ACA"
 	};
 	static char *status_text[] = {
diff --git a/trunk/include/linux/power_supply.h b/trunk/include/linux/power_supply.h
index 204c18dfdc9e..9c83e04f6a43 100644
--- a/trunk/include/linux/power_supply.h
+++ b/trunk/include/linux/power_supply.h
@@ -123,7 +123,8 @@ enum power_supply_property {
 };
 
 enum power_supply_type {
-	POWER_SUPPLY_TYPE_BATTERY = 0,
+	POWER_SUPPLY_TYPE_UNKNOWN = 0,
+	POWER_SUPPLY_TYPE_BATTERY,
 	POWER_SUPPLY_TYPE_UPS,
 	POWER_SUPPLY_TYPE_MAINS,
 	POWER_SUPPLY_TYPE_USB,		/* Standard Downstream Port */