Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

2008-02-07 03:07:03 -05:00
parent 488b5ec871 ad3399c378 7c2670bbb5
commit 877c357e75
4 changed files with 19 additions and 3 deletions
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -94,6 +94,7 @@ enum power_supply_property {
 	/* Properties of type `const char *' */
 	POWER_SUPPLY_PROP_MODEL_NAME,
 	POWER_SUPPLY_PROP_MANUFACTURER,
+	POWER_SUPPLY_PROP_SERIAL_NUMBER,
 };

 enum power_supply_type {