Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index f5f5601701c9..d8f4aaa616f2 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -210,7 +210,7 @@ static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
         if (error) {
                 ehci_halt(ehci);
                 ehci_to_hcd(ehci)->state = HC_STATE_HALT;
-                ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n",
+                ehci_err(ehci, "force halt; handshake %p %08x %08x -> %d\n",
                         ptr, mask, done, error);
         }