summaryrefslogtreecommitdiffstats
path: root/fs/squashfs/squashfs_fs_i.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 17:27:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 17:27:35 -0700
commitbc9bc72e2f9bb07384c00604d1a40d0b5f62be6c (patch)
tree99fc71a5d5889445fb39279d7ff3f0d66c1cca0d /fs/squashfs/squashfs_fs_i.h
parent968d803c98410910fbadca031b6a873d4bc12dd5 (diff)
parentd7f2ff6718efa155fd92e481a5960496d084c63f (diff)
downloadlinux-bc9bc72e2f9bb07384c00604d1a40d0b5f62be6c.tar.gz
linux-bc9bc72e2f9bb07384c00604d1a40d0b5f62be6c.tar.bz2
linux-bc9bc72e2f9bb07384c00604d1a40d0b5f62be6c.zip
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/squashfs_fs_i.h b/fs/squashfs/squashfs_fs_i.h
index 359baefc01fc..73588e7700ed 100644
--- a/fs/squashfs/squashfs_fs_i.h
+++ b/fs/squashfs/squashfs_fs_i.h
@@ -4,7 +4,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@squashfs.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License