diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /lib/decompress.c | |
| parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
| parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'lib/decompress.c')
| -rw-r--r-- | lib/decompress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/decompress.c b/lib/decompress.c index 37f3c786348f..528ff932d8e4 100644 --- a/lib/decompress.c +++ b/lib/decompress.c | |||
| @@ -44,8 +44,8 @@ struct compress_format { | |||
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | static const struct compress_format compressed_formats[] __initconst = { | 46 | static const struct compress_format compressed_formats[] __initconst = { |
| 47 | { {037, 0213}, "gzip", gunzip }, | 47 | { {0x1f, 0x8b}, "gzip", gunzip }, |
| 48 | { {037, 0236}, "gzip", gunzip }, | 48 | { {0x1f, 0x9e}, "gzip", gunzip }, |
| 49 | { {0x42, 0x5a}, "bzip2", bunzip2 }, | 49 | { {0x42, 0x5a}, "bzip2", bunzip2 }, |
| 50 | { {0x5d, 0x00}, "lzma", unlzma }, | 50 | { {0x5d, 0x00}, "lzma", unlzma }, |
| 51 | { {0xfd, 0x37}, "xz", unxz }, | 51 | { {0xfd, 0x37}, "xz", unxz }, |