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

Pull trivial tree from Jiri Kosina:
 "It's indeed trivial -- mostly documentation updates and a bunch of
  typo fixes from Masanari.

  There are also several linux/version.h include removals from Jesper."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
  kcore: fix spelling in read_kcore() comment
  constify struct pci_dev * in obvious cases
  Revert "char: Fix typo in viotape.c"
  init: fix wording error in mm_init comment
  usb: gadget: Kconfig: fix typo for 'different'
  Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
  writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
  writeback: fix typo in the writeback_control comment
  Documentation: Fix multiple typo in Documentation
  tpm_tis: fix tis_lock with respect to RCU
  Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
  Doc: Update numastat.txt
  qla4xxx: Add missing spaces to error messages
  compiler.h: Fix typo
  security: struct security_operations kerneldoc fix
  Documentation: broken URL in libata.tmpl
  Documentation: broken URL in filesystems.tmpl
  mtd: simplify return logic in do_map_probe()
  mm: fix comment typo of truncate_inode_pages_range
  power: bq27x00: Fix typos in comment
  ...

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index a104d5a80e11..e52108c9aaea 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -214,7 +214,7 @@ void __init db88f5281_pci_preinit(void)
                 if (gpio_direction_input(pin) == 0) {
                         irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
-                        printk(KERN_ERR "db88f5281_pci_preinit faield to "
+                        printk(KERN_ERR "db88f5281_pci_preinit failed to "
                                         "set_irq_type pin %d\n", pin);
                         gpio_free(pin);
                 }
@@ -227,7 +227,7 @@ void __init db88f5281_pci_preinit(void)
                 if (gpio_direction_input(pin) == 0) {
                         irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
-                        printk(KERN_ERR "db88f5281_pci_preinit faield "
+                        printk(KERN_ERR "db88f5281_pci_preinit failed "
                                         "to set_irq_type pin %d\n", pin);
                         gpio_free(pin);
                 }
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 96438b6b2022..e3ce61711478 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -149,7 +149,7 @@ void __init rd88f5182_pci_preinit(void)
                 if (gpio_direction_input(pin) == 0) {
                         irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
-                        printk(KERN_ERR "rd88f5182_pci_preinit faield to "
+                        printk(KERN_ERR "rd88f5182_pci_preinit failed to "
                                         "set_irq_type pin %d\n", pin);
                         gpio_free(pin);
                 }
@@ -162,7 +162,7 @@ void __init rd88f5182_pci_preinit(void)
                 if (gpio_direction_input(pin) == 0) {
                         irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
                 } else {
-                        printk(KERN_ERR "rd88f5182_pci_preinit faield to "
+                        printk(KERN_ERR "rd88f5182_pci_preinit failed to "
                                         "set_irq_type pin %d\n", pin);
                         gpio_free(pin);
                 }