From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 16:36:50 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: v3.10-rc1~161
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5d434fcb255dec99189f1c58a06e4f56e12bf77d;p=linux.git

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

Pull trivial tree updates from Jiri Kosina:
 "Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
  code cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
  mm: Convert print_symbol to %pSR
  gfs2: Convert print_symbol to %pSR
  m32r: Convert print_symbol to %pSR
  iostats.txt: add easy-to-find description for field 6
  x86 cmpxchg.h: fix wrong comment
  treewide: Fix typo in printk and comments
  doc: devicetree: Fix various typos
  docbook: fix 8250 naming in device-drivers
  pata_pdc2027x: Fix compiler warning
  treewide: Fix typo in printks
  mei: Fix comments in drivers/misc/mei
  treewide: Fix typos in kernel messages
  pm44xx: Fix comment for "CONFIG_CPU_IDLE"
  doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
  mmzone: correct "pags" to "pages" in comment.
  kernel-parameters: remove outdated 'noresidual' parameter
  Remove spurious _H suffixes from ifdef comments
  sound: Remove stray pluses from Kconfig file
  radio-shark: Fix printk "CONFIG_LED_CLASS"
  doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
  ...
---

5d434fcb255dec99189f1c58a06e4f56e12bf77d
diff --cc Documentation/devicetree/bindings/usb/samsung-usbphy.txt
index f575302e5173,adddcf47c793..33fd3543f3f8
--- a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt
+++ b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt
@@@ -1,12 -1,10 +1,12 @@@
 -* Samsung's usb phy transceiver
 +SAMSUNG USB-PHY controllers
  
 -The Samsung's phy transceiver is used for controlling usb phy for
 -s3c-hsotg as well as ehci-s5p and ohci-exynos usb controllers
 -across Samsung SOCs.
 +** Samsung's usb 2.0 phy transceiver
 +
 +The Samsung's usb 2.0 phy transceiver is used for controlling
 +usb 2.0 phy for s3c-hsotg as well as ehci-s5p and ohci-exynos
 +usb controllers across Samsung SOCs.
  TODO: Adding the PHY binding with controller(s) according to the under
- developement generic PHY driver.
+ development generic PHY driver.
  
  Required properties:
  
diff --cc drivers/clk/mvebu/clk-core.c
index 2628610c1929,1b4e3332ac17..0a53edbae8b8
--- a/drivers/clk/mvebu/clk-core.c
+++ b/drivers/clk/mvebu/clk-core.c
@@@ -156,8 -156,8 +156,8 @@@ static u32 __init armada_370_get_cpu_fr
  
  	cpu_freq_select = ((readl(sar) >> SARL_A370_PCLK_FREQ_OPT) &
  			   SARL_A370_PCLK_FREQ_OPT_MASK);
 -	if (cpu_freq_select > ARRAY_SIZE(armada_370_cpu_frequencies)) {
 +	if (cpu_freq_select >= ARRAY_SIZE(armada_370_cpu_frequencies)) {
- 		pr_err("CPU freq select unsuported %d\n", cpu_freq_select);
+ 		pr_err("CPU freq select unsupported %d\n", cpu_freq_select);
  		cpu_freq = 0;
  	} else
  		cpu_freq = armada_370_cpu_frequencies[cpu_freq_select];
@@@ -278,8 -278,8 +278,8 @@@ static u32 __init armada_xp_get_cpu_fre
  	cpu_freq_select |= (((readl(sar+4) >> SARH_AXP_PCLK_FREQ_OPT) &
  			     SARH_AXP_PCLK_FREQ_OPT_MASK)
  			    << SARH_AXP_PCLK_FREQ_OPT_SHIFT);
 -	if (cpu_freq_select > ARRAY_SIZE(armada_xp_cpu_frequencies)) {
 +	if (cpu_freq_select >= ARRAY_SIZE(armada_xp_cpu_frequencies)) {
- 		pr_err("CPU freq select unsuported: %d\n", cpu_freq_select);
+ 		pr_err("CPU freq select unsupported: %d\n", cpu_freq_select);
  		cpu_freq = 0;
  	} else
  		cpu_freq = armada_xp_cpu_frequencies[cpu_freq_select];