Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index a848c7e20aeb..edb169083840 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -6545,7 +6545,7 @@ static struct ibm_struct volume_driver_data = {
  *      The speeds are stored on handles
  *      (FANA:FAN9), (FANC:FANB), (FANE:FAND).
  *
- *      There are three default speed sets, acessible as handles:
+ *      There are three default speed sets, accessible as handles:
  *      FS1L,FS1M,FS1H; FS2L,FS2M,FS2H; FS3L,FS3M,FS3H
  *
  *      ACPI DSDT switches which set is in use depending on various