Merge branches 'release', 'bugzilla-9916', 'bugzilla-9982', 'bugzilla-9989', 'misc...

diff --combined drivers/acpi/processor_core.c
index 75ccf5d18bf4e3630e892dd0021a8c890a0fc0c2,697335c8423e3865e93ae906834c97386d358d24,75ccf5d18bf4e3630e892dd0021a8c890a0fc0c2,923fddb2caa34fac44ccb743c0a9276818403f8a,75ccf5d18bf4e3630e892dd0021a8c890a0fc0c2,b02006951cd0f21ecb7700eb15d59b67531a2c24,75ccf5d18bf4e3630e892dd0021a8c890a0fc0c2,75ccf5d18bf4e3630e892dd0021a8c890a0fc0c2..a3cc8a98255cf724248c7efbf749a912bc9ef4f1
--- 1/drivers/acpi/processor_core.c
--- 2/drivers/acpi/processor_core.c
--- 3/drivers/acpi/processor_core.c
--- 4/drivers/acpi/processor_core.c
--- 5/drivers/acpi/processor_core.c
--- 6/drivers/acpi/processor_core.c
--- 7/drivers/acpi/processor_core.c
--- 8/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@@@@@@@@ -670,21 -670,21 -670,21 -670,21 -670,21 -670,26 -670,21 -670,21 +670,26 @@@@@@@@@ static int __cpuinit acpi_processor_sta
        
                pr->cdev = thermal_cooling_device_register("Processor", device,
                                                        &processor_cooling_ops);
----- --        if (pr->cdev)
+++++ ++        if (IS_ERR(pr->cdev)) {
+++++ ++                result = PTR_ERR(pr->cdev);
+++++ ++                goto end;
+++++ ++        }
+++++ ++        if (pr->cdev) {
                        printk(KERN_INFO PREFIX
                                "%s is registered as cooling_device%d\n",
                                device->dev.bus_id, pr->cdev->id);
----- --        else
----- --                goto end;
        
----- --        result = sysfs_create_link(&device->dev.kobj, &pr->cdev->device.kobj,
----- --                                        "thermal_cooling");
----- --        if (result)
----- --                return result;
----- --        result = sysfs_create_link(&pr->cdev->device.kobj, &device->dev.kobj,
----- --                                        "device");
----- --        if (result)
----- --                return result;
+++++ ++                result = sysfs_create_link(&device->dev.kobj,
+++++ ++                                           &pr->cdev->device.kobj,
+++++ ++                                           "thermal_cooling");
+++++ ++                if (result)
+++++ ++                        return result;
+++++ ++                result = sysfs_create_link(&pr->cdev->device.kobj,
+++++ ++                                           &device->dev.kobj,
+++++ ++                                           "device");
+++++ ++                if (result)
+++++ ++                        return result;
+++++ ++        }
        
                if (pr->flags.throttling) {
                        printk(KERN_INFO PREFIX "%s [%s] (supports",
@@@@@@@@@ -809,10 -809,12 -809,10 -809,10 -809,10 -814,12 -809,10 -809,10 +814,12 @@@@@@@@@ static int acpi_processor_remove(struc
        
                acpi_processor_remove_fs(device);
        
- --- --        sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
- --- --        sysfs_remove_link(&pr->cdev->device.kobj, "device");
- --- --        thermal_cooling_device_unregister(pr->cdev);
- --- --        pr->cdev = NULL;
+ +++ ++        if (pr->cdev) {
+ +++ ++                sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+ +++ ++                sysfs_remove_link(&pr->cdev->device.kobj, "device");
+ +++ ++                thermal_cooling_device_unregister(pr->cdev);
+ +++ ++                pr->cdev = NULL;
+ +++ ++        }
        
                processors[pr->id] = NULL;
        
@@@@@@@@@ -826,8 -828,8 -826,8 -826,6 -826,8 -833,8 -826,8 -826,8 +833,6 @@@@@@@@@
         *      Acpi processor hotplug support                                      *
         ****************************************************************************/
        
--- ----static int is_processor_present(acpi_handle handle);
--- ----
        static int is_processor_present(acpi_handle handle)
        {
                acpi_status status;

diff --combined drivers/pci/pci-acpi.c
index e569645d59e2f3ef429cac60e1da67840277a348,e569645d59e2f3ef429cac60e1da67840277a348,e569645d59e2f3ef429cac60e1da67840277a348,2f2d308c9aa3606291675a05976d154bc0063702,e818e52dc39ab373e164feec754200f0eac0d1e7,e569645d59e2f3ef429cac60e1da67840277a348,e569645d59e2f3ef429cac60e1da67840277a348,e569645d59e2f3ef429cac60e1da67840277a348..4a23654184fc04da02eb1a73468818709fbe6371
--- 1/drivers/pci/pci-acpi.c
--- 2/drivers/pci/pci-acpi.c
--- 3/drivers/pci/pci-acpi.c
--- 4/drivers/pci/pci-acpi.c
--- 5/drivers/pci/pci-acpi.c
--- 6/drivers/pci/pci-acpi.c
--- 7/drivers/pci/pci-acpi.c
--- 8/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@@@@@@@@ -158,6 -158,6 -158,6 -158,7 -158,6 -158,6 -158,6 -158,6 +158,7 @@@@@@@@@ run_osc_out
        /**
         * __pci_osc_support_set - register OS support to Firmware
         * @flags: OS support bits
+++ ++++ * @hid: hardware ID
         *
         * Update OS support fields and doing a _OSC Query to obtain an update
         * from Firmware on supported control bits.
@@@@@@@@@ -241,8 -241,8 -241,8 -242,8 -241,6 -241,8 -241,8 -241,8 +242,6 @@@@@@@@@ EXPORT_SYMBOL(pci_osc_control_set)
         *      choose from highest power _SxD to lowest power _SxW
         * else // no _PRW at S-state x
         *      choose highest power _SxD or any lower power
---- --- *
---- --- * currently we simply return _SxD, if present.
         */
        
        static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,