aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-12 13:08:06 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-12 13:08:06 -0500
commita7cb7bb664543e4562ab0e9a072470d2d18c761f (patch)
tree7c72fbbc681617be8c89b63c7e98a7e7b09c72de
parentccb5a4910d0ca7b1742b9217db2e1b95817e25ac (diff)
parent078014dd36989c66378dfe80066c3f8a1f6952e8 (diff)
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 ...
-rw-r--r--Documentation/devicetree/bindings/clock/st/st,flexgen.txt2
-rw-r--r--Documentation/scsi/scsi_eh.txt4
-rw-r--r--Documentation/usb/gadget_configfs.txt2
-rw-r--r--arch/arm/boot/dts/bcm63138.dtsi2
-rw-r--r--arch/arm/mach-exynos/Kconfig2
-rw-r--r--arch/mips/cavium-octeon/setup.c4
-rw-r--r--arch/mips/pci/pci-octeon.c2
-rw-r--r--arch/powerpc/kvm/e500_mmu_host.c6
-rw-r--r--arch/powerpc/lib/copyuser_power7.S2
-rw-r--r--arch/powerpc/lib/memcpy_power7.S2
-rw-r--r--arch/powerpc/mm/mmu_decl.h2
-rw-r--r--arch/powerpc/platforms/44x/Kconfig1
-rw-r--r--drivers/clk/Kconfig2
-rw-r--r--drivers/cpufreq/cpufreq-dt.c2
-rw-r--r--drivers/gpio/gpio-msm-v1.c2
-rw-r--r--drivers/gpio/gpio-spear-spics.c2
-rw-r--r--drivers/gpu/drm/radeon/mkregtable.c24
-rw-r--r--drivers/isdn/mISDN/l1oip_core.c2
-rw-r--r--drivers/media/pci/cx18/cx18-driver.h2
-rw-r--r--drivers/media/pci/ttpci/budget-patch.c2
-rw-r--r--drivers/net/ethernet/atheros/atl1c/atl1c_main.c2
-rw-r--r--drivers/pinctrl/spear/pinctrl-plgpio.c2
-rw-r--r--drivers/platform/x86/intel_ips.c2
-rw-r--r--drivers/s390/char/tape_3590.c4
-rw-r--r--drivers/scsi/isci/task.c2
-rw-r--r--drivers/scsi/mac_scsi.c2
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c2
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_ctl.h2
-rw-r--r--drivers/scsi/ps3rom.c1
-rw-r--r--drivers/target/target_core_xcopy.c2
-rw-r--r--drivers/tty/serial/Kconfig2
-rw-r--r--drivers/usb/gadget/function/f_hid.c2
-rw-r--r--drivers/usb/gadget/legacy/zero.c2
-rw-r--r--drivers/usb/host/ehci-sysfs.c2
-rw-r--r--drivers/usb/host/fotg210-hcd.c2
-rw-r--r--drivers/usb/host/fusbh200-hcd.c2
-rw-r--r--drivers/usb/serial/usb-serial-simple.c2
-rw-r--r--drivers/video/fbdev/exynos/exynos_mipi_dsi.c2
-rw-r--r--drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c2
-rw-r--r--fs/reiserfs/journal.c2
-rw-r--r--include/linux/list.h34
-rw-r--r--include/linux/mod_devicetable.h2
-rw-r--r--include/linux/plist.h10
-rw-r--r--include/linux/rculist.h8
-rw-r--r--include/scsi/scsi_host.h2
-rw-r--r--kernel/time/clocksource.c2
-rw-r--r--kernel/trace/trace.c2
-rw-r--r--mm/zbud.c2
-rw-r--r--mm/zswap.c2
-rw-r--r--scripts/kconfig/list.h6
-rw-r--r--tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c2
-rw-r--r--tools/usb/usbip/libsrc/list.h2
52 files changed, 92 insertions, 92 deletions
diff --git a/Documentation/devicetree/bindings/clock/st/st,flexgen.txt b/Documentation/devicetree/bindings/clock/st/st,flexgen.txt
index 1d3ace088172..b7ee5c7e0f75 100644
--- a/Documentation/devicetree/bindings/clock/st/st,flexgen.txt
+++ b/Documentation/devicetree/bindings/clock/st/st,flexgen.txt
@@ -11,7 +11,7 @@ Please find an example below:
11 11
12 Clockgen block diagram 12 Clockgen block diagram
13 ------------------------------------------------------------------- 13 -------------------------------------------------------------------
14 | Flexgen stucture | 14 | Flexgen structure |
15 | --------------------------------------------- | 15 | --------------------------------------------- |
16 | | ------- -------- -------- | | 16 | | ------- -------- -------- | |
17clk_sysin | | | | | | | | | 17clk_sysin | | | | | | | | |
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index a0c85110a07e..8638f61c8c9d 100644
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -172,7 +172,7 @@ ways.
172 172
173 - eh_strategy_handler() callback 173 - eh_strategy_handler() callback
174 This is one big callback which should perform whole error 174 This is one big callback which should perform whole error
175 handling. As such, it should do all choirs SCSI midlayer 175 handling. As such, it should do all chores the SCSI midlayer
176 performs during recovery. This will be discussed in [2-2]. 176 performs during recovery. This will be discussed in [2-2].
177 177
178 Once recovery is complete, SCSI EH resumes normal operation by 178 Once recovery is complete, SCSI EH resumes normal operation by
@@ -428,7 +428,7 @@ scmd->allowed.
428scsi_unjam_host() and it is responsible for whole recovery process. 428scsi_unjam_host() and it is responsible for whole recovery process.
429On completion, the handler should have made lower layers forget about 429On completion, the handler should have made lower layers forget about
430all failed scmds and either ready for new commands or offline. Also, 430all failed scmds and either ready for new commands or offline. Also,
431it should perform SCSI EH maintenance choirs to maintain integrity of 431it should perform SCSI EH maintenance chores to maintain integrity of
432SCSI midlayer. IOW, of the steps described in [2-1-2], all steps 432SCSI midlayer. IOW, of the steps described in [2-1-2], all steps
433except for #1 must be implemented by eh_strategy_handler(). 433except for #1 must be implemented by eh_strategy_handler().
434 434
diff --git a/Documentation/usb/gadget_configfs.txt b/Documentation/usb/gadget_configfs.txt
index 4cf53e406613..635e57493709 100644
--- a/Documentation/usb/gadget_configfs.txt
+++ b/Documentation/usb/gadget_configfs.txt
@@ -376,7 +376,7 @@ functions and binds them. This way the whole gadget is bound.
376configured, so config_groups for particular functions are defined 376configured, so config_groups for particular functions are defined
377in the functions implementation files drivers/usb/gadget/f_*.c. 377in the functions implementation files drivers/usb/gadget/f_*.c.
378 378
3795. Funciton's code is written in such a way that it uses 3795. Function's code is written in such a way that it uses
380 380
381usb_get_function_instance(), which, in turn, calls request_module. 381usb_get_function_instance(), which, in turn, calls request_module.
382So, provided that modprobe works, modules for particular functions 382So, provided that modprobe works, modules for particular functions
diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
index f3bb2dd6269e..d2d8e94e0aa2 100644
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -102,7 +102,7 @@
102 twd_watchdog: watchdog@1e620 { 102 twd_watchdog: watchdog@1e620 {
103 compatible = "arm,cortex-a9-twd-wdt"; 103 compatible = "arm,cortex-a9-twd-wdt";
104 reg = <0x1e620 0x20>; 104 reg = <0x1e620 0x20>;
105 interupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>; 105 interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
106 }; 106 };
107 }; 107 };
108 108
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index b9e3f1c61baf..e4a00bafffc1 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -34,7 +34,7 @@ config ARCH_EXYNOS3
34 bool "SAMSUNG EXYNOS3" 34 bool "SAMSUNG EXYNOS3"
35 select ARM_CPU_SUSPEND if PM 35 select ARM_CPU_SUSPEND if PM
36 help 36 help
37 Samsung EXYNOS3 (Crotex-A7) SoC based systems 37 Samsung EXYNOS3 (Cortex-A7) SoC based systems
38 38
39config ARCH_EXYNOS4 39config ARCH_EXYNOS4
40 bool "SAMSUNG EXYNOS4" 40 bool "SAMSUNG EXYNOS4"
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)
1092 name = edac_device_names[i]; 1092 name = edac_device_names[i];
1093 dev = platform_device_register_simple(name, -1, NULL, 0); 1093 dev = platform_device_register_simple(name, -1, NULL, 0);
1094 if (IS_ERR(dev)) { 1094 if (IS_ERR(dev)) {
1095 pr_err("Registation of %s failed!\n", name); 1095 pr_err("Registration of %s failed!\n", name);
1096 err = PTR_ERR(dev); 1096 err = PTR_ERR(dev);
1097 } 1097 }
1098 } 1098 }
@@ -1103,7 +1103,7 @@ static int __init edac_devinit(void)
1103 dev = platform_device_register_simple("octeon_lmc_edac", 1103 dev = platform_device_register_simple("octeon_lmc_edac",
1104 i, NULL, 0); 1104 i, NULL, 0);
1105 if (IS_ERR(dev)) { 1105 if (IS_ERR(dev)) {
1106 pr_err("Registation of octeon_lmc_edac %d failed!\n", i); 1106