Merge branch 'misc' into release

3 files changed, 10 insertions, 15 deletions

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 3a2cfefc71ab..7338b6a3e049 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -67,7 +67,7 @@ struct dock_station {
         struct list_head dependent_devices;
         struct list_head hotplug_devices;
 
-        struct list_head sibiling;
+        struct list_head sibling;
         struct platform_device *dock_device;
 };
 static LIST_HEAD(dock_stations);
@@ -275,7 +275,7 @@ int is_dock_device(acpi_handle handle)
 
         if (is_dock(handle))
                 return 1;
-        list_for_each_entry(dock_station, &dock_stations, sibiling) {
+        list_for_each_entry(dock_station, &dock_stations, sibling) {
                 if (find_dock_dependent_device(dock_station, handle))
                         return 1;
         }
@@ -619,7 +619,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
          * make sure this handle is for a device dependent on the dock,
          * this would include the dock station itself
          */
-        list_for_each_entry(dock_station, &dock_stations, sibiling) {
+        list_for_each_entry(dock_station, &dock_stations, sibling) {
                 /*
                  * An ATA bay can be in a dock and itself can be ejected
                  * seperately, so there are two 'dock stations' which need the
@@ -651,7 +651,7 @@ void unregister_hotplug_dock_device(acpi_handle handle)
         if (!dock_station_count)
                 return;
 
-        list_for_each_entry(dock_station, &dock_stations, sibiling) {
+        list_for_each_entry(dock_station, &dock_stations, sibling) {
                 dd = find_dock_dependent_device(dock_station, handle);
                 if (dd)
                         dock_del_hotplug_device(dock_station, dd);
@@ -787,7 +787,7 @@ static int acpi_dock_notifier_call(struct notifier_block *this,
         if (event != ACPI_NOTIFY_BUS_CHECK && event != ACPI_NOTIFY_DEVICE_CHECK
            && event != ACPI_NOTIFY_EJECT_REQUEST)
                 return 0;
-        list_for_each_entry(dock_station, &dock_stations, sibiling) {
+        list_for_each_entry(dock_station, &dock_stations, sibling) {
                 if (dock_station->handle == handle) {
                         struct dock_data *dock_data;
 
@@ -958,7 +958,7 @@ static int dock_add(acpi_handle handle)
         dock_station->last_dock_time = jiffies - HZ;
         INIT_LIST_HEAD(&dock_station->dependent_devices);
         INIT_LIST_HEAD(&dock_station->hotplug_devices);
-        INIT_LIST_HEAD(&dock_station->sibiling);
+        INIT_LIST_HEAD(&dock_station->sibling);
         spin_lock_init(&dock_station->dd_lock);
         mutex_init(&dock_station->hp_lock);
         ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
@@ -1044,7 +1044,7 @@ static int dock_add(acpi_handle handle)
         add_dock_dependent_device(dock_station, dd);
 
         dock_station_count++;
-        list_add(&dock_station->sibiling, &dock_stations);
+        list_add(&dock_station->sibling, &dock_stations);
         return 0;
 
 dock_add_err_unregister:
@@ -1149,7 +1149,7 @@ static void __exit dock_exit(void)
         struct dock_station *tmp;
 
         unregister_acpi_bus_notifier(&dock_acpi_notifier);
-        list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibiling)
+        list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibling)
                 dock_remove(dock_station);
 }
 
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index d0d550d22a6d..f8b6f555ba52 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file,
 
         if (len > 4)
                 len = 4;
+        if (len < 0)
+                return -EFAULT;
 
         if (copy_from_user(strbuf, buffer, len))
                 return -EFAULT;
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index c2d4d6e09364..c567b46dfa0f 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -863,13 +863,6 @@ static int acpi_processor_add(struct acpi_device *device)
                 goto err_remove_sysfs;
         }
 
-        if (pr->flags.throttling) {
-                printk(KERN_INFO PREFIX "%s [%s] (supports",
-                       acpi_device_name(device), acpi_device_bid(device));
-                printk(" %d throttling states", pr->throttling.state_count);
-                printk(")\n");
-        }
-
         return 0;
 
 err_remove_sysfs: