Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', ...

diff --cc drivers/acpi/battery.c
Simple merge

diff --cc drivers/acpi/dock.c
Simple merge

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/scan.c
index 189cbc2585fa1cf51ca2ee45615b5f2176c85197,fb7fc24fe72725817ee38e970dc9b90f07998522,0261b116d051628768f974f94fa3842b31a386b2,189cbc2585fa1cf51ca2ee45615b5f2176c85197,fb7fc24fe72725817ee38e970dc9b90f07998522,95c90ff5b9a32059aa9353b4403efb97a0076f94,fb7fc24fe72725817ee38e970dc9b90f07998522,189cbc2585fa1cf51ca2ee45615b5f2176c85197,189cbc2585fa1cf51ca2ee45615b5f2176c85197,189cbc2585fa1cf51ca2ee45615b5f2176c85197..0338f513a010064b14b1bc8adb6a30fd0d44e4db
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
--- 3/drivers/acpi/scan.c
--- 4/drivers/acpi/scan.c
--- 5/drivers/acpi/scan.c
--- 6/drivers/acpi/scan.c
--- 7/drivers/acpi/scan.c
--- 8/drivers/acpi/scan.c
--- 9/drivers/acpi/scan.c
--- 10/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 cbe6f3924a102d327cb92511255c8df0d63329b1,2ff2b6ab5b6c3c656090a4947638bdb9bb618622,416eb0303a8337b885189b601ed52a35126c313e,cbe6f3924a102d327cb92511255c8df0d63329b1,cbe6f3924a102d327cb92511255c8df0d63329b1,cbe6f3924a102d327cb92511255c8df0d63329b1,cbe6f3924a102d327cb92511255c8df0d63329b1,cbe6f3924a102d327cb92511255c8df0d63329b1,cbe6f3924a102d327cb92511255c8df0d63329b1,2c7ca7a4a1465e8efa331b2f8c1cf465219cf341..a0c93b3214827a69bd4ada20fb5742b4dbbfc381
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
--- 3/drivers/acpi/video.c
--- 4/drivers/acpi/video.c
--- 5/drivers/acpi/video.c
--- 6/drivers/acpi/video.c
--- 7/drivers/acpi/video.c
--- 8/drivers/acpi/video.c
--- 9/drivers/acpi/video.c
--- 10/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)

diff --cc drivers/pnp/pnpacpi/rsparser.c
Simple merge