diff --git a/[refs] b/[refs] index 0ff0eab458a6..5d1f71674798 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c5f9be461cd86394a143e73f2325da5938bce0b +refs/heads/master: aee07ba683b3774e8f6660b750b01a1cd26a17a6 diff --git a/trunk/include/acpi/acpixf.h b/trunk/include/acpi/acpixf.h index b729e64d0d4c..d970f7f99549 100644 --- a/trunk/include/acpi/acpixf.h +++ b/trunk/include/acpi/acpixf.h @@ -85,7 +85,7 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function); #endif /* - * ACPI Memory managment + * ACPI Memory management */ void *acpi_allocate(u32 size); diff --git a/trunk/include/acpi/processor.h b/trunk/include/acpi/processor.h index 76411b1fc4fd..6e253b5b0f3b 100644 --- a/trunk/include/acpi/processor.h +++ b/trunk/include/acpi/processor.h @@ -182,7 +182,7 @@ struct acpi_processor_throttling { /* Limit Interface */ struct acpi_processor_lx { - int px; /* performace state */ + int px; /* performance state */ int tx; /* throttle level */ };