Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index dacc64183874..1ac49fef95ab 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -174,7 +174,7 @@ static void kill_procs_ao(struct list_head *to_kill, int doit, int trapno,
         list_for_each_entry_safe (tk, next, to_kill, nd) {
                 if (doit) {
                         /*
-                         * In case something went wrong with munmaping
+                         * In case something went wrong with munmapping
                          * make sure the process doesn't catch the
                          * signal and then access the memory. Just kill it.
                          * the signal handlers