Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/char/rio/route.h b/drivers/char/rio/route.h
index 20ed73f3fd7b..46e963771c30 100644
--- a/drivers/char/rio/route.h
+++ b/drivers/char/rio/route.h
@@ -67,7 +67,7 @@
 typedef struct COST_ROUTE COST_ROUTE;
 struct COST_ROUTE {
         unsigned char cost;     /* Cost down this link */
-        unsigned char route[NODE_BYTES];        /* Nodes thorough this route */
+        unsigned char route[NODE_BYTES];        /* Nodes through this route */
 };
 
 typedef struct ROUTE_STR ROUTE_STR;