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
  ...

diff --cc Documentation/cgroups/memory.txt
Simple merge

diff --cc Documentation/devicetree/bindings/usb/samsung-usbphy.txt
index f575302e5173032143347644c0c29b9591936cc9,adddcf47c793445167d97421c62fe95a4ce04586..33fd3543f3f84e55cd9b5d380caea5805cccfb43
--- 1/Documentation/devicetree/bindings/usb/samsung-usbphy.txt
--- 2/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 Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/kvm/arm.c
Simple merge

diff --cc arch/arm/mach-mvebu/irq-armada-370-xp.c
Simple merge

diff --cc arch/s390/kvm/trace.h
Simple merge

diff --cc drivers/ata/sata_fsl.c
Simple merge

diff --cc drivers/clk/mvebu/clk-core.c
index 2628610c1929b8dbcd12a04f5ccd0ea3b26214f3,1b4e3332ac17bf41a01fd219c3d24cad56ad4f48..0a53edbae8b8ceed17346ac3df2bd38b0060acfa
--- 1/drivers/clk/mvebu/clk-core.c
--- 2/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];

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_irq_kms.c
Simple merge

diff --cc drivers/isdn/i4l/isdn_tty.c
Simple merge

diff --cc drivers/misc/mei/amthif.c
Simple merge

diff --cc drivers/misc/mei/client.c
Simple merge

diff --cc drivers/misc/mei/hbm.c
Simple merge

diff --cc drivers/misc/mei/hw-me.c
Simple merge

diff --cc drivers/misc/mei/interrupt.c
Simple merge

diff --cc drivers/misc/mei/pci-me.c
Simple merge

diff --cc drivers/misc/mei/wd.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
Simple merge

diff --cc drivers/remoteproc/remoteproc_core.c
Simple merge

diff --cc drivers/rtc/rtc-max8997.c
Simple merge

diff --cc drivers/video/amifb.c
Simple merge

diff --cc drivers/video/auo_k190x.c
Simple merge

diff --cc fs/f2fs/super.c
Simple merge

diff --cc include/linux/mmzone.h
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc tools/perf/tests/attr.c
Simple merge

diff --cc tools/perf/tests/parse-events.c
Simple merge