diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 20:27:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 20:27:35 -0400 |
| commit | bc9bc72e2f9bb07384c00604d1a40d0b5f62be6c (patch) | |
| tree | 99fc71a5d5889445fb39279d7ff3f0d66c1cca0d /fs/squashfs/squashfs_fs_i.h | |
| parent | 968d803c98410910fbadca031b6a873d4bc12dd5 (diff) | |
| parent | d7f2ff6718efa155fd92e481a5960496d084c63f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: update email address
Squashfs: add extra sanity checks at mount time
Squashfs: add sanity checks to fragment reading at mount time
Squashfs: add sanity checks to lookup table reading at mount time
Squashfs: add sanity checks to id reading at mount time
Squashfs: add sanity checks to xattr reading at mount time
Squashfs: reverse order of filesystem table reading
Squashfs: move table allocation into squashfs_read_table()
Diffstat (limited to 'fs/squashfs/squashfs_fs_i.h')
| -rw-r--r-- | fs/squashfs/squashfs_fs_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/squashfs_fs_i.h b/fs/squashfs/squashfs_fs_i.h index 359baefc01f..73588e7700e 100644 --- a/fs/squashfs/squashfs_fs_i.h +++ b/fs/squashfs/squashfs_fs_i.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Squashfs | 4 | * Squashfs |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 | 6 | * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
| 7 | * Phillip Lougher <phillip@lougher.demon.co.uk> | 7 | * Phillip Lougher <phillip@squashfs.org.uk> |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 10 | * modify it under the terms of the GNU General Public License | 10 | * modify it under the terms of the GNU General Public License |