Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7cb7bb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents ccb5a491 078014dd

Documentation/devicetree/bindings/clock/st/st,flexgen.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Please find an example below: 


    Clockgen block diagram

    -------------------------------------------------------------------

   |                     Flexgen stucture                              |

   |                     Flexgen structure                             |

   |                  ---------------------------------------------    |

   |                 |    -------       --------       --------    |   |

clk_sysin            |   |       |     |        |     |        |   |   |

Documentation/scsi/scsi_eh.txt

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ ways. 


 - eh_strategy_handler() callback

	This is one big callback which should perform whole error

	handling.  As such, it should do all choirs SCSI midlayer

	handling.  As such, it should do all chores the SCSI midlayer

	performs during recovery.  This will be discussed in [2-2].



 Once recovery is complete, SCSI EH resumes normal operation by
@@ -428,7 +428,7 @@ scmd->allowed. 
scsi_unjam_host() and it is responsible for whole recovery process.

On completion, the handler should have made lower layers forget about

all failed scmds and either ready for new commands or offline.  Also,

it should perform SCSI EH maintenance choirs to maintain integrity of

it should perform SCSI EH maintenance chores to maintain integrity of

SCSI midlayer.  IOW, of the steps described in [2-1-2], all steps

except for #1 must be implemented by eh_strategy_handler().

Documentation/usb/gadget_configfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ functions and binds them. This way the whole gadget is bound. 
configured, so config_groups for particular functions are defined

in the functions implementation files drivers/usb/gadget/f_*.c.



5. Funciton's code is written in such a way that it uses

5. Function's code is written in such a way that it uses



usb_get_function_instance(), which, in turn, calls request_module.

So, provided that modprobe works, modules for particular functions

arch/arm/boot/dts/bcm63138.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ 
		twd_watchdog: watchdog@1e620 {

			compatible = "arm,cortex-a9-twd-wdt";

			reg = <0x1e620 0x20>;

			interupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;

		};

	};

arch/arm/mach-exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ config ARCH_EXYNOS3 
	bool "SAMSUNG EXYNOS3"

	select ARM_CPU_SUSPEND if PM

	help

	  Samsung EXYNOS3 (Crotex-A7) SoC based systems

	  Samsung EXYNOS3 (Cortex-A7) SoC based systems



config ARCH_EXYNOS4

	bool "SAMSUNG EXYNOS4"