From: Adrian Bunk This patch contains the most trivial from Rusty's trivial patches: - spelling fixes - remove duplicate includes Signed-off-by: Adrian Bunk Cc: Rusty Russell Signed-off-by: Andrew Morton --- Documentation/mono.txt | 2 +- Documentation/pci.txt | 2 +- Documentation/sysrq.txt | 2 +- arch/ppc/kernel/cpu_setup_6xx.S | 1 - arch/ppc/kernel/cpu_setup_power4.S | 1 - arch/ppc/kernel/dma-mapping.c | 2 +- arch/ppc64/kernel/cpu_setup_power4.S | 1 - drivers/ide/ide-io.c | 6 +++--- drivers/md/md.c | 4 ++-- drivers/parisc/lasi.c | 1 - drivers/scsi/ibmmca.c | 1 - ipc/mqueue.c | 2 +- 12 files changed, 10 insertions(+), 15 deletions(-) diff -puN arch/ppc64/kernel/cpu_setup_power4.S~merge-some-from-rustys-trivial-patches arch/ppc64/kernel/cpu_setup_power4.S --- devel/arch/ppc64/kernel/cpu_setup_power4.S~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/arch/ppc64/kernel/cpu_setup_power4.S 2005-08-06 15:35:20.000000000 -0700 @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff -puN arch/ppc/kernel/cpu_setup_6xx.S~merge-some-from-rustys-trivial-patches arch/ppc/kernel/cpu_setup_6xx.S --- devel/arch/ppc/kernel/cpu_setup_6xx.S~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/arch/ppc/kernel/cpu_setup_6xx.S 2005-08-06 15:35:20.000000000 -0700 @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff -puN arch/ppc/kernel/cpu_setup_power4.S~merge-some-from-rustys-trivial-patches arch/ppc/kernel/cpu_setup_power4.S --- devel/arch/ppc/kernel/cpu_setup_power4.S~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/arch/ppc/kernel/cpu_setup_power4.S 2005-08-06 15:35:20.000000000 -0700 @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff -puN arch/ppc/kernel/dma-mapping.c~merge-some-from-rustys-trivial-patches arch/ppc/kernel/dma-mapping.c --- devel/arch/ppc/kernel/dma-mapping.c~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/arch/ppc/kernel/dma-mapping.c 2005-08-06 15:35:20.000000000 -0700 @@ -393,7 +393,7 @@ EXPORT_SYMBOL(__dma_sync); * __dma_sync_page() implementation for systems using highmem. * In this case, each page of a buffer must be kmapped/kunmapped * in order to have a virtual address for __dma_sync(). This must - * not sleep so kmap_atmomic()/kunmap_atomic() are used. + * not sleep so kmap_atomic()/kunmap_atomic() are used. * * Note: yes, it is possible and correct to have a buffer extend * beyond the first page. diff -puN Documentation/mono.txt~merge-some-from-rustys-trivial-patches Documentation/mono.txt --- devel/Documentation/mono.txt~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/Documentation/mono.txt 2005-08-06 15:35:20.000000000 -0700 @@ -30,7 +30,7 @@ other program after you have done the fo Read the file 'binfmt_misc.txt' in this directory to know more about the configuration process. -3) Add the following enries to /etc/rc.local or similar script +3) Add the following entries to /etc/rc.local or similar script to be run at system startup: # Insert BINFMT_MISC module into the kernel diff -puN Documentation/pci.txt~merge-some-from-rustys-trivial-patches Documentation/pci.txt --- devel/Documentation/pci.txt~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/Documentation/pci.txt 2005-08-06 15:35:20.000000000 -0700 @@ -84,7 +84,7 @@ Each entry consists of: Most drivers don't need to use the driver_data field. Best practice for use of driver_data is to use it as an index into a static list of -equivalant device types, not to use it as a pointer. +equivalent device types, not to use it as a pointer. Have a table entry {PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID} to have probe() called for every PCI device known to the system. diff -puN Documentation/sysrq.txt~merge-some-from-rustys-trivial-patches Documentation/sysrq.txt --- devel/Documentation/sysrq.txt~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/Documentation/sysrq.txt 2005-08-06 15:35:20.000000000 -0700 @@ -171,7 +171,7 @@ the header 'include/linux/sysrq.h', this Next, you must create a sysrq_key_op struct, and populate it with A) the key handler function you will use, B) a help_msg string, that will print when SysRQ prints help, and C) an action_msg string, that will print right before your -handler is called. Your handler must conform to the protoype in 'sysrq.h'. +handler is called. Your handler must conform to the prototype in 'sysrq.h'. After the sysrq_key_op is created, you can call the macro register_sysrq_key(int key, struct sysrq_key_op *op_p) that is defined in diff -puN drivers/ide/ide-io.c~merge-some-from-rustys-trivial-patches drivers/ide/ide-io.c --- devel/drivers/ide/ide-io.c~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/drivers/ide/ide-io.c 2005-08-06 15:35:20.000000000 -0700 @@ -560,7 +560,7 @@ ide_startstop_t __ide_abort(ide_drive_t EXPORT_SYMBOL_GPL(__ide_abort); /** - * ide_abort - abort pending IDE operatins + * ide_abort - abort pending IDE operations * @drive: drive the error occurred on * @msg: message to report * @@ -623,7 +623,7 @@ static void ide_cmd (ide_drive_t *drive, * @drive: drive the completion interrupt occurred on * * drive_cmd_intr() is invoked on completion of a special DRIVE_CMD. - * We do any necessary daya reading and then wait for the drive to + * We do any necessary data reading and then wait for the drive to * go non busy. At that point we may read the error data and complete * the request */ @@ -773,7 +773,7 @@ EXPORT_SYMBOL_GPL(ide_init_sg_cmd); /** * execute_drive_command - issue special drive command - * @drive: the drive to issue th command on + * @drive: the drive to issue the command on * @rq: the request structure holding the command * * execute_drive_cmd() issues a special drive command, usually diff -puN drivers/md/md.c~merge-some-from-rustys-trivial-patches drivers/md/md.c --- devel/drivers/md/md.c~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/drivers/md/md.c 2005-08-06 15:35:20.000000000 -0700 @@ -73,7 +73,7 @@ static DEFINE_SPINLOCK(pers_lock); * Current RAID-1,4,5 parallel reconstruction 'guaranteed speed limit' * is 1000 KB/sec, so the extra system load does not show up that much. * Increase it if you want to have more _guaranteed_ speed. Note that - * the RAID driver will use the maximum available bandwith if the IO + * the RAID driver will use the maximum available bandwidth if the IO * subsystem is idle. There is also an 'absolute maximum' reconstruction * speed limit - in case reconstruction slows down your system despite * idle IO detection. @@ -3530,7 +3530,7 @@ static void md_do_sync(mddev_t *mddev) printk(KERN_INFO "md: syncing RAID array %s\n", mdname(mddev)); printk(KERN_INFO "md: minimum _guaranteed_ reconstruction speed:" " %d KB/sec/disc.\n", sysctl_speed_limit_min); - printk(KERN_INFO "md: using maximum available idle IO bandwith " + printk(KERN_INFO "md: using maximum available idle IO bandwidth " "(but not more than %d KB/sec) for reconstruction.\n", sysctl_speed_limit_max); diff -puN drivers/parisc/lasi.c~merge-some-from-rustys-trivial-patches drivers/parisc/lasi.c --- devel/drivers/parisc/lasi.c~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/drivers/parisc/lasi.c 2005-08-06 15:35:20.000000000 -0700 @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff -puN drivers/scsi/ibmmca.c~merge-some-from-rustys-trivial-patches drivers/scsi/ibmmca.c --- devel/drivers/scsi/ibmmca.c~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/drivers/scsi/ibmmca.c 2005-08-06 15:35:20.000000000 -0700 @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff -puN ipc/mqueue.c~merge-some-from-rustys-trivial-patches ipc/mqueue.c --- devel/ipc/mqueue.c~merge-some-from-rustys-trivial-patches 2005-08-06 15:35:20.000000000 -0700 +++ devel-akpm/ipc/mqueue.c 2005-08-06 15:35:20.000000000 -0700 @@ -69,7 +69,7 @@ struct mqueue_inode_info { struct sigevent notify; pid_t notify_owner; - struct user_struct *user; /* user who created, for accouting */ + struct user_struct *user; /* user who created, for accounting */ struct sock *notify_sock; struct sk_buff *notify_cookie; _