diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-19 13:46:53 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-19 13:46:53 -0500 |
commit | 21d1ee8b375bcd180f1d6b8ccbb8d8f938596310 (patch) | |
tree | 2e82b65c16a4aaa88eeb7dd9f47f2d1c418e77d0 /fs/ntfs/sysctl.c | |
parent | 3d9b1cdd2455017c6aa25bc2442092b81438981f (diff) | |
parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
download | linux-21d1ee8b375bcd180f1d6b8ccbb8d8f938596310.tar.gz linux-21d1ee8b375bcd180f1d6b8ccbb8d8f938596310.tar.bz2 linux-21d1ee8b375bcd180f1d6b8ccbb8d8f938596310.zip |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs/ntfs/sysctl.c')
-rw-r--r-- | fs/ntfs/sysctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c index 75067e4f3036..1c23138d00b3 100644 --- a/fs/ntfs/sysctl.c +++ b/fs/ntfs/sysctl.c @@ -3,7 +3,7 @@ * the Linux-NTFS project. Adapted from the old NTFS driver, * Copyright (C) 1997 Martin von Löwis, Régis Duchesne * - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -67,7 +67,7 @@ int ntfs_sysctl(int add) return -ENOMEM; #ifdef CONFIG_PROC_FS /* - * If the proc file system is in use and we are a module, need + * If the proc filesystem is in use and we are a module, need * to set the owner of our proc entry to our module. In the * non-modular case, THIS_MODULE is NULL, so this is ok. */ |