Merge branches 'release', 'misc' and 'misc-2.6.25' into release

This commit is contained in:
Len Brown
2008-02-07 03:13:13 -05:00
10 changed files with 25 additions and 19 deletions

View File

@@ -170,7 +170,7 @@ static int acpi_pm_enter(suspend_state_t pm_state)
/* Reprogram control registers and execute _BFS */
acpi_leave_sleep_state_prep(acpi_state);
/* ACPI 3.0 specs (P62) says that it's the responsabilty
/* ACPI 3.0 specs (P62) says that it's the responsibility
* of the OSPM to clear the status bit [ implying that the
* POWER_BUTTON event should not reach userspace ]
*/