Merge branches 'release' and 'dock' into release

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 307cef65c24758bacb00ef7a2700fcb96a29738b..fa44fb96fc343d1c8dcb54b0b01e5849061f8678 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -710,6 +710,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
        if (!count)
                return -EINVAL;
 
+       begin_undock(dock_station);
        ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
        return ret ? ret: count;
 }