Merge branch 'master' into for-next

[linux-beck.git] / kernel / power / swap.c

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 8c7e4832b9be0f8e031fb07645f6ad8e955c0318..69425889bd40f0f3e3c26ee417775349df0da90c 100644 (file)
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -888,7 +888,7 @@ out_finish:
 /**
  *     swsusp_read - read the hibernation image.
  *     @flags_p: flags passed by the "frozen" kernel in the image header should
- *               be written into this memeory location
+ *               be written into this memory location
  */
 
 int swsusp_read(unsigned int *flags_p)