diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /lib | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/crc32.c | 2 | ||||
-rw-r--r-- | lib/zlib_deflate/defutil.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/crc32.c b/lib/crc32.c index d2c2f257bedd..49d1c9e3ce38 100644 --- a/lib/crc32.c +++ b/lib/crc32.c | |||
@@ -348,7 +348,7 @@ EXPORT_SYMBOL(crc32_be); | |||
348 | * but again the multiple of the polynomial to subtract depends only on | 348 | * but again the multiple of the polynomial to subtract depends only on |
349 | * the high bits, the high 8 bits in this case. | 349 | * the high bits, the high 8 bits in this case. |
350 | * | 350 | * |
351 | * The multile we need in that case is the low 32 bits of a 40-bit | 351 | * The multiple we need in that case is the low 32 bits of a 40-bit |
352 | * value whose high 8 bits are given, and which is a multiple of the | 352 | * value whose high 8 bits are given, and which is a multiple of the |
353 | * generator polynomial. This is simply the CRC-32 of the given | 353 | * generator polynomial. This is simply the CRC-32 of the given |
354 | * one-byte message. | 354 | * one-byte message. |
diff --git a/lib/zlib_deflate/defutil.h b/lib/zlib_deflate/defutil.h index d9feaf638608..6b15a909ca3f 100644 --- a/lib/zlib_deflate/defutil.h +++ b/lib/zlib_deflate/defutil.h | |||
@@ -164,7 +164,7 @@ typedef struct deflate_state { | |||
164 | int nice_match; /* Stop searching when current match exceeds this */ | 164 | int nice_match; /* Stop searching when current match exceeds this */ |
165 | 165 | ||
166 | /* used by trees.c: */ | 166 | /* used by trees.c: */ |
167 | /* Didn't use ct_data typedef below to supress compiler warning */ | 167 | /* Didn't use ct_data typedef below to suppress compiler warning */ |
168 | struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ | 168 | struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ |
169 | struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ | 169 | struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ |
170 | struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ | 170 | struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ |