aboutsummaryrefslogtreecommitdiffstats
path: root/fs/isofs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-10-20 00:26:44 -0400
committerSteve French <sfrench@us.ibm.com>2007-10-20 00:26:44 -0400
commit748c5151deb56e4b7b5a9b07a884243764933831 (patch)
treee9dd45b8806d00b56503cfa55c46f3ebce0d151c /fs/isofs
parent4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff)
parente8b8c977734193adedf2b0f607d6252c78e86394 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/isofs')
-rw-r--r--fs/isofs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index aa359a2e4c..09e3d306e9 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * (C) 1991 Linus Torvalds - minix filesystem 4 * (C) 1991 Linus Torvalds - minix filesystem
5 * 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem. 5 * 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem.
6 * 1994 Eberhard Moenkeberg - multi session handling. 6 * 1994 Eberhard Mรถnkeberg - multi session handling.
7 * 1995 Mark Dobie - allow mounting of some weird VideoCDs and PhotoCDs. 7 * 1995 Mark Dobie - allow mounting of some weird VideoCDs and PhotoCDs.
8 * 1997 Gordon Chaffee - Joliet CDs 8 * 1997 Gordon Chaffee - Joliet CDs
9 * 1998 Eric Lammerts - ISO 9660 Level 3 9 * 1998 Eric Lammerts - ISO 9660 Level 3