Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / drivers / acpi / dock.c

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index b2586f5..d9a85f1 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -605,7 +605,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
        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
+                * separately, so there are two 'dock stations' which need the
                 * ops
                 */
                dd = find_dock_dependent_device(dock_station, handle);