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

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
  Jesper Juhl is the new trivial patches maintainer
  Documentation: mention email-clients.txt in SubmittingPatches
  fs/binfmt_elf.c: spello fix
  do_invalidatepage() comment typo fix
  Documentation/filesystems/porting fixes
  typo fixes in net/core/net_namespace.c
  typo fix in net/rfkill/rfkill.c
  typo fixes in net/sctp/sm_statefuns.c
  lib/: Spelling fixes
  kernel/: Spelling fixes
  include/scsi/: Spelling fixes
  include/linux/: Spelling fixes
  include/asm-m68knommu/: Spelling fixes
  include/asm-frv/: Spelling fixes
  fs/: Spelling fixes
  drivers/watchdog/: Spelling fixes
  drivers/video/: Spelling fixes
  drivers/ssb/: Spelling fixes
  drivers/serial/: Spelling fixes
  drivers/scsi/: Spelling fixes
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c
index e3744eb8eccb..dd38011ee0b7 100644
--- a/drivers/mtd/nand/autcpu12.c
+++ b/drivers/mtd/nand/autcpu12.c
@@ -20,7 +20,7 @@
  *
  *      02-12-2002 TG   Cleanup of module params
  *
- *      02-20-2002 TG   adjusted for different rd/wr adress support
+ *      02-20-2002 TG   adjusted for different rd/wr address support
  *                      added support for read device ready/busy line
  *                      added page_cache
  *
@@ -144,7 +144,7 @@ static int __init autcpu12_init(void)
                 goto out;
         }
 
-        /* map physical adress */
+        /* map physical address */
         autcpu12_fio_base = ioremap(AUTCPU12_PHYS_SMC, SZ_1K);
         if (!autcpu12_fio_base) {
                 printk("Ioremap autcpu12 SmartMedia Card failed\n");
@@ -227,7 +227,7 @@ static void __exit autcpu12_cleanup(void)
         /* Release resources, unregister device */
         nand_release(autcpu12_mtd);
 
-        /* unmap physical adress */
+        /* unmap physical address */
         iounmap(autcpu12_fio_base);
 
         /* Free the MTD device structure */