Merge tag 'v3.8-rc7' into regulator-core

[~andy/linux] / lib / decompress_unxz.c

diff --git a/lib/decompress_unxz.c b/lib/decompress_unxz.c
index cecd23df2b9a6e986ea6cbdd3418015a5ecf4a8f..9f34eb56854d64eeebd4dcfcc9993a64c6aa585a 100644 (file)
--- a/lib/decompress_unxz.c
+++ b/lib/decompress_unxz.c
@@ -83,7 +83,7 @@
  *    safety_margin = 128 + uncompressed_size * 8 / 32768 + 65536
  *                  = 128 + (uncompressed_size >> 12) + 65536
  *
- * For comparision, according to arch/x86/boot/compressed/misc.c, the
+ * For comparison, according to arch/x86/boot/compressed/misc.c, the
  * equivalent formula for Deflate is this:
  *
  *    safety_margin = 18 + (uncompressed_size >> 12) + 32768