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

+1 -1

arch/arm/include/asm/kvm_asm.h

··· 23 23 #define c0_MPIDR 1 /* MultiProcessor ID Register */ 24 24 #define c0_CSSELR 2 /* Cache Size Selection Register */ 25 25 #define c1_SCTLR 3 /* System Control Register */ 26 - #define c1_ACTLR 4 /* Auxilliary Control Register */ 26 + #define c1_ACTLR 4 /* Auxiliary Control Register */ 27 27 #define c1_CPACR 5 /* Coprocessor Access Control */ 28 28 #define c2_TTBR0 6 /* Translation Table Base Register 0 */ 29 29 #define c2_TTBR0_high 7 /* TTBR0 top 32 bits */

+2 -2

arch/arm/lib/lib1funcs.S

··· 167 167 168 168 #endif 169 169 170 - @ Perform all needed substractions to keep only the reminder. 170 + @ Perform all needed subtractions to keep only the reminder. 171 171 @ Do comparisons in batch of 4 first. 172 172 subs \order, \order, #3 @ yes, 3 is intended here 173 173 blt 2f ··· 189 189 teqne \dividend, #0 190 190 beq 5f 191 191 192 - @ Either 1, 2 or 3 comparison/substractions are left. 192 + @ Either 1, 2 or 3 comparison/subtractions are left. 193 193 2: cmn \order, #2 194 194 blt 4f 195 195 beq 3f

+1 -1

arch/arm64/include/asm/kvm_asm.h

··· 27 27 #define MPIDR_EL1 1 /* MultiProcessor Affinity Register */ 28 28 #define CSSELR_EL1 2 /* Cache Size Selection Register */ 29 29 #define SCTLR_EL1 3 /* System Control Register */ 30 - #define ACTLR_EL1 4 /* Auxilliary Control Register */ 30 + #define ACTLR_EL1 4 /* Auxiliary Control Register */ 31 31 #define CPACR_EL1 5 /* Coprocessor Access Control */ 32 32 #define TTBR0_EL1 6 /* Translation Table Base Register 0 */ 33 33 #define TTBR1_EL1 7 /* Translation Table Base Register 1 */

+1 -1

arch/xtensa/Kconfig

··· 151 151 the CPU core definition and currently needs to be selected manually. 152 152 153 153 Multiprocessor support in implemented with external cache and 154 - interrupt controlers. 154 + interrupt controllers. 155 155 156 156 The MX interrupt distributer adds Interprocessor Interrupts 157 157 and causes the IRQ numbers to be increased by 4 for devices

+2 -2

drivers/gpu/drm/radeon/atombios.h

··· 7944 7944 typedef struct { 7945 7945 AMD_ACPI_DESCRIPTION_HEADER SHeader; 7946 7946 UCHAR TableUUID[16]; //0x24 7947 - ULONG VBIOSImageOffset; //0x34. Offset to the first GOP_VBIOS_CONTENT block from the beginning of the stucture. 7948 - ULONG Lib1ImageOffset; //0x38. Offset to the first GOP_LIB1_CONTENT block from the beginning of the stucture. 7947 + ULONG VBIOSImageOffset; //0x34. Offset to the first GOP_VBIOS_CONTENT block from the beginning of the structure. 7948 + ULONG Lib1ImageOffset; //0x38. Offset to the first GOP_LIB1_CONTENT block from the beginning of the structure. 7949 7949 ULONG Reserved[4]; //0x3C 7950 7950 }UEFI_ACPI_VFCT; 7951 7951

+1 -1

drivers/isdn/i4l/isdn_net.c

··· 58 58 * About SOFTNET: 59 59 * Most of the changes were pretty obvious and basically done by HE already. 60 60 * 61 - * One problem of the isdn net device code is that is uses struct net_device 61 + * One problem of the isdn net device code is that it uses struct net_device 62 62 * for masters and slaves. However, only master interface are registered to 63 63 * the network layer, and therefore, it only makes sense to call netif_* 64 64 * functions on them.

+3 -3

drivers/media/pci/cx25821/cx25821-medusa-reg.h

··· 84 84 #define ABIST_BIN4_VGA3 0x01D4 85 85 #define ABIST_BIN5_VGA4 0x01D8 86 86 #define ABIST_BIN6_VGA5 0x01DC 87 - #define ABIST_BIN7_VGA6 0x0x1E0 88 - #define ABIST_CLAMP_A 0x0x1E4 89 - #define ABIST_CLAMP_B 0x0x1E8 87 + #define ABIST_BIN7_VGA6 0x01E0 88 + #define ABIST_CLAMP_A 0x01E4 89 + #define ABIST_CLAMP_B 0x01E8 90 90 #define ABIST_CLAMP_C 0x01EC 91 91 #define ABIST_CLAMP_D 0x01F0 92 92 #define ABIST_CLAMP_E 0x01F4

+2 -2

drivers/platform/x86/Kconfig

··· 660 660 depends on ACPI 661 661 ---help--- 662 662 This driver adds support for the built-in accelerometer 663 - found on recent Toshiba laptops equiped with HID TOS620A 663 + found on recent Toshiba laptops equipped with HID TOS620A 664 664 device. 665 665 666 666 This driver receives ACPI notify events 0x80 when the sensor ··· 669 669 been stabilized. 670 670 671 671 Also provides sysfs entries to get/set the desired protection 672 - level and reseting the HDD protection interface. 672 + level and resetting the HDD protection interface. 673 673 674 674 If you have a recent Toshiba laptop with a built-in accelerometer 675 675 device, say Y.

+1 -1

drivers/rapidio/rio-scan.c

··· 83 83 * @destid: destID to reserve 84 84 * 85 85 * Tries to reserve the specified destID. 86 - * Returns 0 if successfull. 86 + * Returns 0 if successful. 87 87 */ 88 88 static int rio_destid_reserve(struct rio_net *net, u16 destid) 89 89 {

+1 -1

drivers/scsi/Kconfig

··· 52 52 This option enables the new blk-mq based I/O path for SCSI 53 53 devices by default. With the option the scsi_mod.use_blk_mq 54 54 module/boot option defaults to Y, without it to N, but it can 55 - still be overriden either way. 55 + still be overridden either way. 56 56 57 57 If unsure say N. 58 58

+6 -6

drivers/scsi/lpfc/lpfc_debugfs.c

··· 710 710 * returns a pointer to that log in the private_data field in @file. 711 711 * 712 712 * Returns: 713 - * This function returns zero if successful. On error it will return an negative 713 + * This function returns zero if successful. On error it will return a negative 714 714 * error value. 715 715 **/ 716 716 static int ··· 760 760 * returns a pointer to that log in the private_data field in @file. 761 761 * 762 762 * Returns: 763 - * This function returns zero if successful. On error it will return an negative 763 + * This function returns zero if successful. On error it will return a negative 764 764 * error value. 765 765 **/ 766 766 static int ··· 810 810 * returns a pointer to that log in the private_data field in @file. 811 811 * 812 812 * Returns: 813 - * This function returns zero if successful. On error it will return an negative 813 + * This function returns zero if successful. On error it will return a negative 814 814 * error value. 815 815 **/ 816 816 static int ··· 852 852 * returns a pointer to that log in the private_data field in @file. 853 853 * 854 854 * Returns: 855 - * This function returns zero if successful. On error it will return an negative 855 + * This function returns zero if successful. On error it will return a negative 856 856 * error value. 857 857 **/ 858 858 static int ··· 894 894 * returns a pointer to that log in the private_data field in @file. 895 895 * 896 896 * Returns: 897 - * This function returns zero if successful. On error it will return an negative 897 + * This function returns zero if successful. On error it will return a negative 898 898 * error value. 899 899 **/ 900 900 static int ··· 1115 1115 * returns a pointer to that log in the private_data field in @file. 1116 1116 * 1117 1117 * Returns: 1118 - * This function returns zero if successful. On error it will return an negative 1118 + * This function returns zero if successful. On error it will return a negative 1119 1119 * error value. 1120 1120 **/ 1121 1121 static int

+1 -1

drivers/scsi/megaraid/megaraid_sas_base.c

··· 4747 4747 4748 4748 /** 4749 4749 * megasas_release_mfi - Reverses the FW initialization 4750 - * @intance: Adapter soft state 4750 + * @instance: Adapter soft state 4751 4751 */ 4752 4752 static void megasas_release_mfi(struct megasas_instance *instance) 4753 4753 {

+1 -1

drivers/scsi/megaraid/megaraid_sas_fusion.c

··· 2334 2334 2335 2335 /** 2336 2336 * megasas_release_fusion - Reverses the FW initialization 2337 - * @intance: Adapter soft state 2337 + * @instance: Adapter soft state 2338 2338 */ 2339 2339 void 2340 2340 megasas_release_fusion(struct megasas_instance *instance)

+1 -1

drivers/scsi/qla4xxx/ql4_83xx.c

··· 828 828 ret_val = qla4_83xx_flash_read_u32(ha, addr, p_buff, 829 829 tmplt_hdr_def_size); 830 830 if (ret_val != QLA_SUCCESS) { 831 - ql4_printk(KERN_ERR, ha, "%s: Failed to read reset tempelate\n", 831 + ql4_printk(KERN_ERR, ha, "%s: Failed to read reset template\n", 832 832 __func__); 833 833 goto exit_read_template_error; 834 834 }

+1 -1

drivers/scsi/qla4xxx/ql4_bsg.c

··· 571 571 572 572 if ((config & ENABLE_INTERNAL_LOOPBACK) || 573 573 (config & ENABLE_EXTERNAL_LOOPBACK)) { 574 - ql4_printk(KERN_INFO, ha, "%s: Loopback diagnostics already in progress. Invalid requiest\n", 574 + ql4_printk(KERN_INFO, ha, "%s: Loopback diagnostics already in progress. Invalid request\n", 575 575 __func__); 576 576 goto exit_pre_loopback_config; 577 577 }

+1 -1

drivers/usb/serial/Kconfig

··· 171 171 ---help--- 172 172 Say Y here if you want to use a FTDI SIO single port USB to serial 173 173 converter device. The implementation I have is called the USC-1000. 174 - This driver has also be tested with the 245 and 232 devices. 174 + This driver has also been tested with the 245 and 232 devices. 175 175 176 176 See <http://ftdi-usb-sio.sourceforge.net/> for more 177 177 information on this driver and the device.

+1 -1

include/linux/crc-itu-t.h

··· 3 3 * 4 4 * Implements the standard CRC ITU-T V.41: 5 5 * Width 16 6 - * Poly 0x0x1021 (x^16 + x^12 + x^15 + 1) 6 + * Poly 0x1021 (x^16 + x^12 + x^15 + 1) 7 7 * Init 0 8 8 * 9 9 * This source code is licensed under the GNU General Public License,

+1 -1

include/linux/netfilter_bridge/ebtables.h

··· 6 6 * 7 7 * ebtables.c,v 2.0, April, 2002 8 8 * 9 - * This code is stongly inspired on the iptables code which is 9 + * This code is strongly inspired by the iptables code which is 10 10 * Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling 11 11 */ 12 12 #ifndef __LINUX_BRIDGE_EFF_H

+1 -1

include/linux/rio.h

··· 298 298 * struct rio_net - RIO network info 299 299 * @node: Node in global list of RIO networks 300 300 * @devices: List of devices in this network 301 - * @switches: List of switches in this netowrk 301 + * @switches: List of switches in this network 302 302 * @mports: List of master ports accessing this network 303 303 * @hport: Default port for accessing this network 304 304 * @id: RIO network ID

+1 -1

include/uapi/linux/netfilter_bridge/ebtables.h

··· 6 6 * 7 7 * ebtables.c,v 2.0, April, 2002 8 8 * 9 - * This code is stongly inspired on the iptables code which is 9 + * This code is strongly inspired by the iptables code which is 10 10 * Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling 11 11 */ 12 12

+1 -1

lib/crc-itu-t.c

··· 9 9 #include <linux/module.h> 10 10 #include <linux/crc-itu-t.h> 11 11 12 - /** CRC table for the CRC ITU-T V.41 0x0x1021 (x^16 + x^12 + x^15 + 1) */ 12 + /** CRC table for the CRC ITU-T V.41 0x1021 (x^16 + x^12 + x^15 + 1) */ 13 13 const u16 crc_itu_t_table[256] = { 14 14 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 15 15 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,

+1 -1

net/bridge/netfilter/ebtables.c

··· 6 6 * 7 7 * ebtables.c,v 2.0, July, 2002 8 8 * 9 - * This code is stongly inspired on the iptables code which is 9 + * This code is strongly inspired by the iptables code which is 10 10 * Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling 11 11 * 12 12 * This program is free software; you can redistribute it and/or