Merge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/linux...

[~andy/linux] / fs / squashfs / dir.c

diff --git a/fs/squashfs/dir.c b/fs/squashfs/dir.c
index 3f79cd1d0c197b4428356c120fbff7cead1042fe..9dfe2ce0fb70f0b0caee3d14c9f0f3026bf5d3f4 100644 (file)
--- a/fs/squashfs/dir.c
+++ b/fs/squashfs/dir.c
@@ -2,7 +2,7 @@
  * Squashfs - a compressed read only filesystem for Linux
  *
  * 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