Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree update from Jiri Kosina:
 "Usual stuff: documentation updates, printk() fixes, etc"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
  intel_ips: fix a type in error message
  cpufreq: cpufreq-dt: Move newline to end of error message
  ps3rom: fix error return code
  treewide: fix typo in printk and Kconfig
  ARM: dts: bcm63138: change "interupts" to "interrupts"
  Replace mentions of "list_struct" to "list_head"
  kernel: trace: fix printk message
  scsi: mpt2sas: fix ioctl in comment
  zbud, zswap: change module author email
  clocksource: Fix 'clcoksource' typo in comment
  arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help
  gpio: msm-v1: make boolean argument more obvious
  usb: Fix typo in usb-serial-simple.c
  PCI: Fix comment typo 'COMFIG_PM_OPS'
  powerpc: Fix comment typo 'CONIFG_8xx'
  powerpc: Fix comment typos 'CONFiG_ALTIVEC'
  clk: st: Spelling s/stucture/structure/
  isci: Spelling s/stucture/structure/
  usb: gadget: zero: Spelling s/infrastucture/infrastructure/
  treewide: Fix company name in module descriptions
  ...

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 5ebdb32d9a2b..94f888d3384e 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1092,7 +1092,7 @@ static int __init edac_devinit(void)
                 name = edac_device_names[i];
                 dev = platform_device_register_simple(name, -1, NULL, 0);
                 if (IS_ERR(dev)) {
-                        pr_err("Registation of %s failed!\n", name);
+                        pr_err("Registration of %s failed!\n", name);
                         err = PTR_ERR(dev);
                 }
         }
@@ -1103,7 +1103,7 @@ static int __init edac_devinit(void)
                 dev = platform_device_register_simple("octeon_lmc_edac",
                                                       i, NULL, 0);
                 if (IS_ERR(dev)) {
-                        pr_err("Registation of octeon_lmc_edac %d failed!\n", i);
+                        pr_err("Registration of octeon_lmc_edac %d failed!\n", i);
                         err = PTR_ERR(dev);
                 }
         }
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index 59cccd95688b..d07e04121cc6 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -708,7 +708,7 @@ static int __init octeon_pci_setup(void)
 
         if (IS_ERR(platform_device_register_simple("octeon_pci_edac",
                                                    -1, NULL, 0)))
-                pr_err("Registation of co_pci_edac failed!\n");
+                pr_err("Registration of co_pci_edac failed!\n");
 
         octeon_pci_dma_init();