Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index c70927ecda21..61c5572d2b91 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -427,7 +427,7 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
 
                 /*
                  * We need to use vmap to get the desired page protection
-                 * or to make the buffer object look contigous.
+                 * or to make the buffer object look contiguous.
                  */
                 prot = (mem->placement & TTM_PL_FLAG_CACHED) ?
                         PAGE_KERNEL :