diff --git a/[refs] b/[refs]
index 6708a97dccff..23fa8deee7c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daf22c3c4444e10a852a2f460f5cb1a43038bd53
+refs/heads/master: c78f2b64963654419a8cd3b7e264251860e9f9eb
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
index 3bd2ed86fea2..e24485f35384 100644
--- a/trunk/drivers/power/Kconfig
+++ b/trunk/drivers/power/Kconfig
@@ -116,12 +116,12 @@ config BATTERY_WM97XX
 	help
 	  Say Y to enable support for battery measured by WM97xx aux port.
 
-config BATTERY_BQ20Z75
-        tristate "TI BQ20z75 gas gauge"
+config BATTERY_SBS
+        tristate "SBS Compliant gas gauge"
         depends on I2C
         help
-         Say Y to include support for TI BQ20z75 SBS-compliant
-         gas gauge and protection IC.
+	  Say Y to include support for SBS battery driver for SBS-compliant
+	  gas gauges.
 
 config BATTERY_BQ27x00
 	tristate "BQ27x00 battery driver"
diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
index 9a78b1dd570b..9c3bbf76a2bf 100644
--- a/trunk/drivers/power/Makefile
+++ b/trunk/drivers/power/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o
 obj-$(CONFIG_BATTERY_TOSA)	+= tosa_battery.o
 obj-$(CONFIG_BATTERY_COLLIE)	+= collie_battery.o
 obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
-obj-$(CONFIG_BATTERY_BQ20Z75)	+= bq20z75.o
+obj-$(CONFIG_BATTERY_SBS)	+= sbs-battery.o
 obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
 obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
diff --git a/trunk/drivers/power/bq20z75.c b/trunk/drivers/power/sbs-battery.c
similarity index 100%
rename from trunk/drivers/power/bq20z75.c
rename to trunk/drivers/power/sbs-battery.c
diff --git a/trunk/include/linux/power/bq20z75.h b/trunk/include/linux/power/sbs-battery.h
similarity index 100%
rename from trunk/include/linux/power/bq20z75.h
rename to trunk/include/linux/power/sbs-battery.h