diff --git a/[refs] b/[refs] index f2635d2f79d6..fbc64600e3ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4407245ac5c5defa303c05828c57d7855aa7e5ee +refs/heads/master: c7060d9e9e5aceaddaa58df87221befff963ec3f diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c index 63a17b55b39b..7a0f4aa4fa1e 100644 --- a/trunk/drivers/acpi/acpi_memhotplug.c +++ b/trunk/drivers/acpi/acpi_memhotplug.c @@ -20,7 +20,7 @@ * * * ACPI based HotPlug driver that supports Memory Hotplug - * This driver fields notifications from firmare for memory add + * This driver fields notifications from firmware for memory add * and remove operations and alerts the VM of the affected memory * ranges. */