Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 7e8f56815998..48cb154c7a46 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -98,7 +98,7 @@ static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, __le32 *op)
 
                 op_count++;
 
-                /* loop throgh all bytes of message i */
+                /* loop through all bytes of message i */
                 for(j = 0; j < m[i].len; j++) {
                         /* write back all bytes that could have been read */
                         m[i].buf[j] = (le32_to_cpu(op[op_count/3]) >> ((3-(op_count%3))*8));