diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 04:10:26 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 04:10:26 (GMT) |
commit | 8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06 (patch) | |
tree | 1a081f09ebcf2a84de899ddeadd0e4c5e48b50d2 /fs/squashfs/xattr.c | |
parent | 54525552c6ccfd867e819845da14be994e303218 (diff) | |
parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
download | linux-fsl-qoriq-8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'fs/squashfs/xattr.c')
-rw-r--r-- | fs/squashfs/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c index 3876c36..92fcde7 100644 --- a/fs/squashfs/xattr.c +++ b/fs/squashfs/xattr.c @@ -2,7 +2,7 @@ * Squashfs - a compressed read only filesystem for Linux * * Copyright (c) 2010 - * 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 |