Merge with Linux 2.4.2.

29 files changed, 35 insertions, 35 deletions

diff --git a/fs/hfs/balloc.c b/fs/hfs/balloc.c
index 4edd6b748..58d281784 100644
--- a/fs/hfs/balloc.c
+++ b/fs/hfs/balloc.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/balloc.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * hfs_bnode_alloc() and hfs_bnode_bitop() are based on GPLed code
  * Copyright (C) 1995  Michael Dreher
diff --git a/fs/hfs/bdelete.c b/fs/hfs/bdelete.c
index c968c74b7..aec139476 100644
--- a/fs/hfs/bdelete.c
+++ b/fs/hfs/bdelete.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/bdelete.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the code to delete records in a B-tree.
  *
diff --git a/fs/hfs/bfind.c b/fs/hfs/bfind.c
index d8d7e933d..8e84133d2 100644
--- a/fs/hfs/bfind.c
+++ b/fs/hfs/bfind.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/bfind.c
  *
  * Copyright (C) 1995, 1996  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the code to access records in a btree.
  *
diff --git a/fs/hfs/bins_del.c b/fs/hfs/bins_del.c
index 4a08a39d1..a03b959e3 100644
--- a/fs/hfs/bins_del.c
+++ b/fs/hfs/bins_del.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/bins_del.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the code common to inserting and deleting records
  * in a B-tree.
diff --git a/fs/hfs/binsert.c b/fs/hfs/binsert.c
index 0c0c5076a..6f0853892 100644
--- a/fs/hfs/binsert.c
+++ b/fs/hfs/binsert.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/binsert.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the code to insert records in a B-tree.
  *
diff --git a/fs/hfs/bitmap.c b/fs/hfs/bitmap.c
index 4fcec675f..c9bb850d3 100644
--- a/fs/hfs/bitmap.c
+++ b/fs/hfs/bitmap.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/bitmap.c
  *
  * Copyright (C) 1996-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * Based on GPLed code Copyright (C) 1995  Michael Dreher
  *
diff --git a/fs/hfs/bitops.c b/fs/hfs/bitops.c
index 1d3a113bb..e2cb38877 100644
--- a/fs/hfs/bitops.c
+++ b/fs/hfs/bitops.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/bitops.c
  *
  * Copyright (C) 1996  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains functions to handle bitmaps in "left-to-right"
  * bit-order such that the MSB of a 32-bit big-endian word is bit 0.
diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c
index e2eb8f70b..d7f0566e3 100644
--- a/fs/hfs/bnode.c
+++ b/fs/hfs/bnode.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/bnode.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the code to access nodes in the B-tree structure.
  *
diff --git a/fs/hfs/brec.c b/fs/hfs/brec.c
index 8f6d70c07..4db76fc4f 100644
--- a/fs/hfs/brec.c
+++ b/fs/hfs/brec.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/brec.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the code to access records in a btree.
  *
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index fb5fec426..bc23f94c2 100644
--- a/fs/hfs/btree.c
+++ b/fs/hfs/btree.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/btree.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the code to manipulate the B-tree structure.
  * The catalog and extents files are both B-trees.
diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
index e2b975fae..85134f0b3 100644
--- a/fs/hfs/catalog.c
+++ b/fs/hfs/catalog.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/catalog.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the functions related to the catalog B-tree.
  *
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index d6de087e9..4f35c2760 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/dir.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains directory-related functions independent of which
  * scheme is being used to represent forks.
diff --git a/fs/hfs/dir_cap.c b/fs/hfs/dir_cap.c
index 9dfb4ab82..3c000cdd5 100644
--- a/fs/hfs/dir_cap.c
+++ b/fs/hfs/dir_cap.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the inode_operations and file_operations
  * structures for HFS directories under the CAP scheme.
diff --git a/fs/hfs/dir_dbl.c b/fs/hfs/dir_dbl.c
index 8e39508fa..8b7f876c3 100644
--- a/fs/hfs/dir_dbl.c
+++ b/fs/hfs/dir_dbl.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/dir_dbl.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the inode_operations and file_operations
  * structures for HFS directories.
diff --git a/fs/hfs/dir_nat.c b/fs/hfs/dir_nat.c
index 4d050e698..d378aa3a0 100644
--- a/fs/hfs/dir_nat.c
+++ b/fs/hfs/dir_nat.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/dir_nat.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the inode_operations and file_operations
  * structures for HFS directories.
diff --git a/fs/hfs/extent.c b/fs/hfs/extent.c
index eca17bc63..5df23375a 100644
--- a/fs/hfs/extent.c
+++ b/fs/hfs/extent.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/extent.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the functions related to the extents B-tree.
  *
diff --git a/fs/hfs/file.c b/fs/hfs/file.c
index 35fbac9de..b5c444a82 100644
--- a/fs/hfs/file.c
+++ b/fs/hfs/file.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/file.c
  *
  * Copyright (C) 1995, 1996  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the file-related functions which are independent of
  * which scheme is being used to represent forks.
@@ -135,9 +135,9 @@ int hfs_get_block(struct inode *inode, long iblock, struct buffer_head *bh_resul
  * This is the read field in the inode_operations structure for
  * "regular" (non-header) files.  The purpose is to transfer up to
  * 'count' bytes from the file corresponding to 'inode', beginning at
- * 'filp->offset' bytes into the file.	The data is transfered to
+ * 'filp->offset' bytes into the file.	The data is transferred to
  * user-space at the address 'buf'.  Returns the number of bytes
- * successfully transfered.  This function checks the arguments, does
+ * successfully transferred.  This function checks the arguments, does
  * some setup and then calls hfs_do_read() to do the actual transfer.  */
 static hfs_rwret_t hfs_file_read(struct file * filp, char * buf, 
 				 hfs_rwarg_t count, loff_t *ppos)
@@ -277,7 +277,7 @@ static inline int xlate_from_user(char *data, const char *buf, int count)
  * hfs_do_read()
  *
  * This function transfers actual data from disk to user-space memory,
- * returning the number of bytes successfully transfered.  'fork' tells
+ * returning the number of bytes successfully transferred.  'fork' tells
  * which file on the disk to read from.  'pos' gives the offset into
  * the Linux file at which to begin the transfer.  Note that this will
  * differ from 'filp->offset' in the case of an AppleDouble header file
@@ -433,7 +433,7 @@ hfs_s32 hfs_do_read(struct inode *inode, struct hfs_fork * fork, hfs_u32 pos,
  * hfs_do_write()
  *
  * This function transfers actual data from user-space memory to disk,
- * returning the number of bytes successfully transfered.  'fork' tells
+ * returning the number of bytes successfully transferred.  'fork' tells
  * which file on the disk to write to.  'pos' gives the offset into
  * the Linux file at which to begin the transfer.  Note that this will
  * differ from 'filp->offset' in the case of an AppleDouble header file
diff --git a/fs/hfs/file_cap.c b/fs/hfs/file_cap.c
index 2268185e6..0e8c24f5d 100644
--- a/fs/hfs/file_cap.c
+++ b/fs/hfs/file_cap.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/file_cap.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the file_ops and inode_ops for the metadata
  * files under the CAP representation.
diff --git a/fs/hfs/file_hdr.c b/fs/hfs/file_hdr.c
index ba62615b0..c22f71611 100644
--- a/fs/hfs/file_hdr.c
+++ b/fs/hfs/file_hdr.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/file_hdr.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the file_ops and inode_ops for the metadata
  * files under the AppleDouble and Netatalk representations.
@@ -348,9 +348,9 @@ static void set_dates(struct hfs_cat_entry *entry, struct inode *inode,
  * This is the read field in the inode_operations structure for
  * header files.  The purpose is to transfer up to 'count' bytes
  * from the file corresponding to 'inode', beginning at
- * 'filp->offset' bytes into the file.	The data is transfered to
+ * 'filp->offset' bytes into the file.	The data is transferred to
  * user-space at the address 'buf'.  Returns the number of bytes
- * successfully transfered.
+ * successfully transferred.
  */
 /* XXX: what about the entry count changing on us? */
 static hfs_rwret_t hdr_read(struct file * filp, char * buf, 
diff --git a/fs/hfs/hfs.h b/fs/hfs/hfs.h
index 9552bbb34..f266bc0c4 100644
--- a/fs/hfs/hfs.h
+++ b/fs/hfs/hfs.h
@@ -2,7 +2,7 @@
  * linux/fs/hfs/hfs.h
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * "XXX" in a comment is a note to myself to consider changing something.
  */
diff --git a/fs/hfs/hfs_btree.h b/fs/hfs/hfs_btree.h
index 39d6df4d5..c3371bfa8 100644
--- a/fs/hfs/hfs_btree.h
+++ b/fs/hfs/hfs_btree.h
@@ -2,7 +2,7 @@
  * linux/fs/hfs/hfs_btree.h
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the declarations of the private B-tree
  * structures and functions.
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 327125506..705d31341 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/inode.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains inode-related functions which do not depend on
  * which scheme is being used to represent forks.
diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c
index b44fdafc8..d907a632d 100644
--- a/fs/hfs/mdb.c
+++ b/fs/hfs/mdb.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/mdb.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains functions for reading/writing the MDB.
  *
diff --git a/fs/hfs/part_tbl.c b/fs/hfs/part_tbl.c
index 2392a0791..221157226 100644
--- a/fs/hfs/part_tbl.c
+++ b/fs/hfs/part_tbl.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/part_tbl.c
  *
  * Copyright (C) 1996-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * Original code to handle the new style Mac partition table based on
  * a patch contributed by Holger Schemel (aeglos@valinor.owl.de).
diff --git a/fs/hfs/string.c b/fs/hfs/string.c
index 18e59de5d..f499b9a80 100644
--- a/fs/hfs/string.c
+++ b/fs/hfs/string.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/string.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the string comparison function for the
  * Macintosh character set.
diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 8c91758d6..a39710f09 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/super.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains hfs_read_super(), some of the super_ops and
  * init_module() and cleanup_module().	The remaining super_ops are in
diff --git a/fs/hfs/sysdep.c b/fs/hfs/sysdep.c
index 344856064..4ce747a49 100644
--- a/fs/hfs/sysdep.c
+++ b/fs/hfs/sysdep.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/sysdep.c
  *
  * Copyright (C) 1996  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the code to do various system dependent things.
  *
diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c
index 2e5127703..64adf73fc 100644
--- a/fs/hfs/trans.c
+++ b/fs/hfs/trans.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/trans.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains routines for converting between the Macintosh
  * character set and various other encodings.  This includes dealing
diff --git a/fs/hfs/version.c b/fs/hfs/version.c
index 365e9f375..ef0283ec0 100644
--- a/fs/hfs/version.c
+++ b/fs/hfs/version.c
@@ -2,7 +2,7 @@
  * linux/fs/hfs/version.c
  *
  * Copyright (C) 1995-1997  Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
  *
  * This file contains the version string for this release.
  */