Merge branch 'fujitsu' into release

diff --cc drivers/platform/x86/Kconfig
Simple merge

diff --cc drivers/platform/x86/fujitsu-laptop.c
index eabddc9,1ed3513..f35aee5
--- 1/drivers/platform/x86/fujitsu-laptop.c
--- 2/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@@ -697,10 -691,10 +691,10 @@@ static int acpi_fujitsu_add(struct acpi
        result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
        if (result) {
                printk(KERN_ERR "Error reading power state\n");
-               goto end;
+               goto err_unregister_input_dev;
        }
  
 -      printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
 +      printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
  
@@@ -871,10 -862,10 +862,10 @@@ static int acpi_fujitsu_hotkey_add(stru
        result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
        if (result) {
                printk(KERN_ERR "Error reading power state\n");
-               goto end;
+               goto err_unregister_input_dev;
        }
  
 -      printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
 +      printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");