Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
  fix do_sys_open() prototype
  sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
  Documentation: Fix typo in SubmitChecklist.
  Typo: depricated -> deprecated
  Add missing profile=kvm option to Documentation/kernel-parameters.txt
  fix typo about TBI in e1000 comment
  proc.txt: Add /proc/stat field
  small documentation fixes
  Fix compiler warning in smount example program from sharedsubtree.txt
  docs/sysfs: add missing word to sysfs attribute explanation
  documentation/ext3: grammar fixes
  Documentation/java.txt: typo and grammar fixes
  Documentation/filesystems/vfs.txt: typo fix
  include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
  trivial copy_data_pages() tidy up
  Fix typo in arch/x86/kernel/tsc_32.c
  file link fix for Pegasus USB net driver help
  remove unused return within void return function
  Typo fixes retrun -> return
  x86 hpet.h: remove broken links
  ...

5 files changed, 8 insertions, 8 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index ca843522f91..57a5f63d6ae 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -120,7 +120,7 @@
  *                       Reformat to match kernel tabbing style.
  *                       Add CDROM_GET_UPC ioctl.
  * 3.10  Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI.
- * 3.11  Apr 29, 1996 -- Patch from Heiko Eissfeldt <heiko@colossus.escape.de>
+ * 3.11  Apr 29, 1996 -- Patch from Heiko Eißfeldt <heiko@colossus.escape.de>
  *                       to remove redundant verify_area calls.
  * 3.12  May  7, 1996 -- Rudimentary changer support.  Based on patches
  *                        from Gerhard Zuber <zuber@berlin.snafu.de>.
@@ -256,7 +256,7 @@
  *                      - Minimize the TOC reading - only do it when we
  *                        know a media change has occurred.
  *                      - Moved all the CDROMREADx ioctls to the Uniform layer.
- *                      - Heiko Eissfeldt <heiko@colossus.escape.de> supplied
+ *                      - Heiko Eißfeldt <heiko@colossus.escape.de> supplied
  *                        some fixes for CDI.
  *                      - CD-ROM leaving door locked fix from Andries
  *                        Brouwer <Andries.Brouwer@cwi.nl>
@@ -2341,7 +2341,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
                    If we get an error for the regular case, we assume
                    a CDI without additional audio tracks. In this case
                    the readable TOC is empty (CDI tracks are not included)
-                   and only holds the Leadout entry. Heiko Eißfeldt */
+                   and only holds the Leadout entry. Heiko Eißfeldt */
                 ntracks = 0;
                 stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0,
                                            (char *)&toc->hdr,
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index e5a86a962b2..7b9181b5469 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -565,7 +565,7 @@ typedef struct os_dat_s {
  *      The following parameter is used to select the point in the internal
  *      tape fifo in which we will start to refill the buffer. Decreasing
  *      the following parameter will improve the system's latency and
- *      interactive response, while using a high value might improve sytem
+ *      interactive response, while using a high value might improve system
  *      throughput.
  */
 #define IDETAPE_FIFO_THRESHOLD          2
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 44cdb745a6f..a73db1bd482 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -101,7 +101,7 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
 
 /* 
  * the static array is needed to have the name reported in /proc/ioports,
- * hwif->name unfortunately isn´t available yet
+ * hwif->name unfortunately isn't available yet
  */
 static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={
         "ide0", "ide1"
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 1a7ddd12e65..5c997543531 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -95,7 +95,7 @@ struct it821x_dev
 
 /*
  *      We allow users to force the card into non raid mode without
- *      flashing the alternative BIOS. This is also neccessary right now
+ *      flashing the alternative BIOS. This is also necessary right now
  *      for embedded platforms that cannot run a PC BIOS but are using this
  *      device.
  */
@@ -564,7 +564,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
 
         /*
          *      Not in the docs but according to the reference driver
-         *      this is neccessary.
+         *      this is necessary.
          */
 
         pci_read_config_byte(hwif->pci_dev, 0x08, &conf);
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index dc915cb22be..6d99441c605 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -26,7 +26,7 @@
  *
  *      If you have strange problems with nVidia chipset systems please
  *      see the SI support documentation and update your system BIOS
- *      if neccessary
+ *      if necessary
  *
  *  The Dell DRAC4 has some interesting features including effectively hot
  *  unplugging/replugging the virtual CD interface when the DRAC is reset.