From: Len Brown <len.brown@intel.com>
Date: Tue, 6 Apr 2010 21:06:22 +0000 (-0400)
Subject: Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', ... 
X-Git-Tag: v2.6.34-rc4~21^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c25f7cf2032aaac9bd50d6eee982719878538082;p=linux-2.6-block.git

Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', 'bugzilla-15521', 'bugzilla-15605', 'gpe-reference-counters', 'misc', 'pxm-fix' and 'video-random-key' into release
---

c25f7cf2032aaac9bd50d6eee982719878538082
diff --cc drivers/acpi/scan.c
index 189cbc2585fa,fb7fc24fe727,0261b116d051,189cbc2585fa,fb7fc24fe727,95c90ff5b9a3,fb7fc24fe727,189cbc2585fa,189cbc2585fa,189cbc2585fa..0338f513a010
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@@@@@@@@@ -1118,8 -1082,6 -1119,8 -1118,8 -1082,6 -1112,14 -1082,6 -1118,8 -1118,8 -1118,8 +1113,14 @@@@@@@@@@@ static void acpi_device_set_id(struct a
          			acpi_add_id(device, ACPI_BAY_HID);
          		else if (ACPI_SUCCESS(acpi_dock_match(device)))
          			acpi_add_id(device, ACPI_DOCK_HID);
 +  + +   		else if (!acpi_ibm_smbus_match(device))
 +  + +   			acpi_add_id(device, ACPI_SMBUS_IBM_HID);
+++++ ++++		else if (!acpi_device_hid(device) &&
+++++ ++++			 ACPI_IS_ROOT_DEVICE(device->parent)) {
+++++ ++++			acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
+++++ ++++			strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
+++++ ++++			strcpy(device->pnp.device_class, ACPI_BUS_CLASS);
+++++ ++++		}
          
          		break;
          	case ACPI_BUS_TYPE_POWER:
diff --cc drivers/acpi/video.c
index cbe6f3924a10,2ff2b6ab5b6c,416eb0303a83,cbe6f3924a10,cbe6f3924a10,cbe6f3924a10,cbe6f3924a10,cbe6f3924a10,cbe6f3924a10,2c7ca7a4a146..a0c93b321482
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@@@@@@@@@ -1019,7 -1015,8 -1020,14 -1019,7 -1019,7 -1019,7 -1019,7 -1019,7 -1019,7 -1019,7 +1020,14 @@@@@@@@@@@ static void acpi_video_device_find_cap(
          		kfree(name);
          		if (IS_ERR(device->backlight))
          			return;
 -        		device->backlight->props.max_brightness = device->brightness->count-3;
 +        
++ +++++++		/*
++ +++++++		 * Save current brightness level in case we have to restore it
++ +++++++		 * before acpi_video_device_lcd_set_level() is called next time.
++ +++++++		 */
++ +++++++		device->backlight->props.brightness =
++ +++++++				acpi_video_get_brightness(device->backlight);
+  +++++++
          		result = sysfs_create_link(&device->backlight->dev.kobj,
          					   &device->dev->dev.kobj, "device");
          		if (result)