diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 11:47:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 11:47:51 -0700 |
commit | af6ea9ca23504fe620412826a420dca9c43a8bf6 (patch) | |
tree | 19bebbeb442a8d08ad29f2056665b5fdd9bf1478 /fs/ntfs/sysctl.c | |
parent | 1fa4aad496b9c96fcde6c8f905a43ae6733e5a79 (diff) | |
parent | c514720716c7b109ff980f8b3cb93f9af872c91c (diff) | |
download | op-kernel-dev-af6ea9ca23504fe620412826a420dca9c43a8bf6.zip op-kernel-dev-af6ea9ca23504fe620412826a420dca9c43a8bf6.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
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 75067e4..1c23138 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. */ |