diff options
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 | | | ------- -------- -------- | | |
| 17 | clk_sysin | | | | | | | | | | 17 | clk_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. | |||
| 428 | scsi_unjam_host() and it is responsible for whole recovery process. | 428 | scsi_unjam_host() and it is responsible for whole recovery process. |
| 429 | On completion, the handler should have made lower layers forget about | 429 | On completion, the handler should have made lower layers forget about |
| 430 | all failed scmds and either ready for new commands or offline. Also, | 430 | all failed scmds and either ready for new commands or offline. Also, |
| 431 | it should perform SCSI EH maintenance choirs to maintain integrity of | 431 | it should perform SCSI EH maintenance chores to maintain integrity of |
| 432 | SCSI midlayer. IOW, of the steps described in [2-1-2], all steps | 432 | SCSI midlayer. IOW, of the steps described in [2-1-2], all steps |
| 433 | except for #1 must be implemented by eh_strategy_handler(). | 433 | except 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. | |||
| 376 | configured, so config_groups for particular functions are defined | 376 | configured, so config_groups for particular functions are defined |
| 377 | in the functions implementation files drivers/usb/gadget/f_*.c. | 377 | in the functions implementation files drivers/usb/gadget/f_*.c. |
| 378 | 378 | ||
| 379 | 5. Funciton's code is written in such a way that it uses | 379 | 5. Function's code is written in such a way that it uses |
| 380 | 380 | ||
| 381 | usb_get_function_instance(), which, in turn, calls request_module. | 381 | usb_get_function_instance(), which, in turn, calls request_module. |
| 382 | So, provided that modprobe works, modules for particular functions | 382 | So, 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 | ||
| 39 | config ARCH_EXYNOS4 | 39 | config 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 | pr_err("Registration of octeon_lmc_edac %d failed!\n", i); |
| 1107 | err = PTR_ERR(dev); | 1107 | err = PTR_ERR(dev); |
| 1108 | } | 1108 | } |
| 1109 | } | 1109 | } |
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c index 59cccd95688b..d07e04121cc6 100644 --- a/arch/mips/pci/pci-octeon.c +++ b/arch/mips/pci/pci-octeon.c | |||
| @@ -708,7 +708,7 @@ static int __init octeon_pci_setup(void) | |||
| 708 | 708 | ||
| 709 | if (IS_ERR(platform_device_register_simple("octeon_pci_edac", | 709 | if (IS_ERR(platform_device_register_simple("octeon_pci_edac", |
| 710 | -1, NULL, 0))) | 710 | -1, NULL, 0))) |
| 711 | pr_err("Registation of co_pci_edac failed!\n"); | 711 | pr_err("Registration of co_pci_edac failed!\n"); |
| 712 | 712 | ||
| 713 | octeon_pci_dma_init(); | 713 | octeon_pci_dma_init(); |
| 714 | 714 | ||
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 769778f855b0..cc536d4a75ef 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c | |||
| @@ -661,7 +661,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type, | |||
| 661 | if (unlikely((pr && !(mas3 & MAS3_UX)) || | 661 | if (unlikely((pr && !(mas3 & MAS3_UX)) || |
| 662 | (!pr && !(mas3 & MAS3_SX)))) { | 662 | (!pr && !(mas3 & MAS3_SX)))) { |
| 663 | pr_err_ratelimited( | 663 | pr_err_ratelimited( |
