Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Pull trivial tree updates from Jiri Kosina:
"The usual stuff from trivial tree for 4.3 (kerneldoc updates, printk()
fixes, Documentation and MAINTAINERS updates)"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
MAINTAINERS: update my e-mail address
mod_devicetable: add space before */
scsi: a100u2w: trivial typo in printk
i2c: Fix typo in i2c-bfin-twi.c
treewide: fix typos in comment blocks
Doc: fix trivial typo in SubmittingPatches
proportions: Spelling s/consitent/consistent/
dm: Spelling s/consitent/consistent/
aic7xxx: Fix typo in error message
pcmcia: Fix typo in locking documentation
scsi/arcmsr: Fix typos in error log
drm/nouveau/gr: Fix typo in nv10.c
[SCSI] Fix printk typos in drivers/scsi
staging: comedi: Grammar s/Enable support a/Enable support for a/
Btrfs: Spelling s/consitent/consistent/
README: GTK+ is a acronym
ASoC: omap: Fix typo in config option description
mm: tlb.c: Fix error message
ntfs: super.c: Fix error log
fix typo in Documentation/SubmittingPatches
...

+70 -70
+1 -1
Documentation/SubmittingPatches
··· 291 291 292 292 If you have a patch that fixes an exploitable security bug, send that patch 293 293 to security@kernel.org. For severe bugs, a short embargo may be considered 294 - to allow distrbutors to get the patch out to users; in such cases, 294 + to allow distributors to get the patch out to users; in such cases, 295 295 obviously, the patch should not be sent to any public lists. 296 296 297 297 Patches that fix a severe bug in a released kernel should be directed
+1 -1
Documentation/pcmcia/locking.txt
··· 96 96 3. Per PCMCIA-device Data: 97 97 -------------------------- 98 98 99 - The "main" struct pcmcia_devie is protected as follows (read-only fields 99 + The "main" struct pcmcia_device is protected as follows (read-only fields 100 100 or single-use fields not mentioned): 101 101 102 102
+9 -9
MAINTAINERS
··· 361 361 F: drivers/input/touchscreen/ad7879.c 362 362 363 363 ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR) 364 - M: Jiri Kosina <jkosina@suse.com> 364 + M: Jiri Kosina <jikos@kernel.org> 365 365 S: Maintained 366 366 367 367 ADM1025 HARDWARE MONITOR DRIVER ··· 752 752 F: sound/aoa/ 753 753 754 754 APM DRIVER 755 - M: Jiri Kosina <jkosina@suse.com> 755 + M: Jiri Kosina <jikos@kernel.org> 756 756 S: Odd fixes 757 757 F: arch/x86/kernel/apm_32.c 758 758 F: include/linux/apm_bios.h ··· 4264 4264 F: drivers/block/rsxx/ 4265 4265 4266 4266 FLOPPY DRIVER 4267 - M: Jiri Kosina <jkosina@suse.com> 4267 + M: Jiri Kosina <jikos@kernel.org> 4268 4268 T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git 4269 4269 S: Odd fixes 4270 4270 F: drivers/block/floppy.c ··· 4835 4835 F: arch/*/include/asm/suspend*.h 4836 4836 4837 4837 HID CORE LAYER 4838 - M: Jiri Kosina <jkosina@suse.com> 4838 + M: Jiri Kosina <jikos@kernel.org> 4839 4839 L: linux-input@vger.kernel.org 4840 4840 T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git 4841 4841 S: Maintained ··· 4844 4844 F: include/uapi/linux/hid* 4845 4845 4846 4846 HID SENSOR HUB DRIVERS 4847 - M: Jiri Kosina <jkosina@suse.com> 4847 + M: Jiri Kosina <jikos@kernel.org> 4848 4848 M: Jonathan Cameron <jic23@kernel.org> 4849 4849 M: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> 4850 4850 L: linux-input@vger.kernel.org ··· 5597 5597 F: net/netfilter/ipvs/ 5598 5598 5599 5599 IPWIRELESS DRIVER 5600 - M: Jiri Kosina <jkosina@suse.com> 5600 + M: Jiri Kosina <jikos@kernel.org> 5601 5601 M: David Sterba <dsterba@suse.com> 5602 5602 S: Odd Fixes 5603 5603 F: drivers/tty/ipwireless/ ··· 6286 6286 LIVE PATCHING 6287 6287 M: Josh Poimboeuf <jpoimboe@redhat.com> 6288 6288 M: Seth Jennings <sjenning@redhat.com> 6289 - M: Jiri Kosina <jkosina@suse.com> 6289 + M: Jiri Kosina <jikos@kernel.org> 6290 6290 M: Vojtech Pavlik <vojtech@suse.com> 6291 6291 S: Maintained 6292 6292 F: kernel/livepatch/ ··· 8062 8062 F: drivers/pinctrl/spear/ 8063 8063 8064 8064 PKTCDVD DRIVER 8065 - M: Jiri Kosina <jkosina@suse.com> 8065 + M: Jiri Kosina <jikos@kernel.org> 8066 8066 S: Maintained 8067 8067 F: drivers/block/pktcdvd.c 8068 8068 F: include/linux/pktcdvd.h ··· 10668 10668 F: include/linux/usb/gadget* 10669 10669 10670 10670 USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...) 10671 - M: Jiri Kosina <jkosina@suse.com> 10671 + M: Jiri Kosina <jikos@kernel.org> 10672 10672 L: linux-usb@vger.kernel.org 10673 10673 T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git 10674 10674 S: Maintained
+2 -2
arch/ia64/mm/tlb.c
··· 444 444 if (p->pte & 0x1) 445 445 if (is_tr_overlap(p, va, log_size)) { 446 446 printk(KERN_DEBUG "Overlapped Entry" 447 - "Inserted for TR Reigster!!\n"); 447 + "Inserted for TR Register!!\n"); 448 448 goto out; 449 449 } 450 450 } ··· 456 456 if (p->pte & 0x1) 457 457 if (is_tr_overlap(p, va, log_size)) { 458 458 printk(KERN_DEBUG "Overlapped Entry" 459 - "Inserted for TR Reigster!!\n"); 459 + "Inserted for TR Register!!\n"); 460 460 goto out; 461 461 } 462 462 }
+1 -1
arch/metag/include/asm/elf.h
··· 11 11 #define R_METAG_RELBRANCH 4 12 12 #define R_METAG_GETSETOFF 5 13 13 14 - /* Backward compatability */ 14 + /* Backward compatibility */ 15 15 #define R_METAG_REG32OP1 6 16 16 #define R_METAG_REG32OP2 7 17 17 #define R_METAG_REG32OP3 8
+1 -1
arch/mips/kernel/setup.c
··· 476 476 * o bootmem_init() 477 477 * o sparse_init() 478 478 * o paging_init() 479 - * o dma_continguous_reserve() 479 + * o dma_contiguous_reserve() 480 480 * 481 481 * At this stage the bootmem allocator is ready to use. 482 482 *
+1 -1
arch/powerpc/kvm/book3s.c
··· 902 902 { 903 903 /* 904 904 * We always return 0 for book3s. We check 905 - * for compatability while loading the HV 905 + * for compatibility while loading the HV 906 906 * or PR module 907 907 */ 908 908 return 0;
+1 -1
arch/powerpc/sysdev/fsl_pci.c
··· 1113 1113 IRQF_SHARED, 1114 1114 "[PCI] PME", hose); 1115 1115 if (res < 0) { 1116 - dev_err(&dev->dev, "Unable to requiest irq %d for PME\n", pme_irq); 1116 + dev_err(&dev->dev, "Unable to request irq %d for PME\n", pme_irq); 1117 1117 irq_dispose_mapping(pme_irq); 1118 1118 1119 1119 return -ENODEV;
+1 -1
arch/sparc/include/uapi/asm/pstate.h
··· 88 88 #define VERS_MAXTL _AC(0x000000000000ff00,UL) /* Max Trap Level. */ 89 89 #define VERS_MAXWIN _AC(0x000000000000001f,UL) /* Max RegWindow Idx.*/ 90 90 91 - /* Compatability Feature Register (%asr26), SPARC-T4 and later */ 91 + /* Compatibility Feature Register (%asr26), SPARC-T4 and later */ 92 92 #define CFR_AES _AC(0x0000000000000001,UL) /* Supports AES opcodes */ 93 93 #define CFR_DES _AC(0x0000000000000002,UL) /* Supports DES opcodes */ 94 94 #define CFR_KASUMI _AC(0x0000000000000004,UL) /* Supports KASUMI opcodes */
+1 -1
drivers/gpio/gpiolib-acpi.c
··· 68 68 * GPIO controller driver. 69 69 * 70 70 * Typically the returned offset is same as @pin, but if the GPIO 71 - * controller uses pin controller and the mapping is not contigous the 71 + * controller uses pin controller and the mapping is not contiguous the 72 72 * offset might be different. 73 73 */ 74 74 static int acpi_gpiochip_pin_to_gpio_offset(struct gpio_chip *chip, int pin)
+2 -2
drivers/gpu/drm/drm_atomic_helper.c
··· 750 750 * This function shuts down all the outputs that need to be shut down and 751 751 * prepares them (if required) with the new mode. 752 752 * 753 - * For compatability with legacy crtc helpers this should be called before 753 + * For compatibility with legacy crtc helpers this should be called before 754 754 * drm_atomic_helper_commit_planes(), which is what the default commit function 755 755 * does. But drivers with different needs can group the modeset commits together 756 756 * and do the plane commits at the end. This is useful for drivers doing runtime ··· 775 775 * This function enables all the outputs with the new configuration which had to 776 776 * be turned off for the update. 777 777 * 778 - * For compatability with legacy crtc helpers this should be called after 778 + * For compatibility with legacy crtc helpers this should be called after 779 779 * drm_atomic_helper_commit_planes(), which is what the default commit function 780 780 * does. But drivers with different needs can group the modeset commits together 781 781 * and do the plane commits at the end. This is useful for drivers doing runtime
+2 -2
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
··· 845 845 if (nv10_gr_ctx_regs[i] == reg) 846 846 return i; 847 847 } 848 - nv_error(priv, "unknow offset nv10_ctx_regs %d\n", reg); 848 + nv_error(priv, "unknown offset nv10_ctx_regs %d\n", reg); 849 849 return -1; 850 850 } 851 851 ··· 857 857 if (nv17_gr_ctx_regs[i] == reg) 858 858 return i; 859 859 } 860 - nv_error(priv, "unknow offset nv17_ctx_regs %d\n", reg); 860 + nv_error(priv, "unknown offset nv17_ctx_regs %d\n", reg); 861 861 return -1; 862 862 } 863 863
+1 -1
drivers/gpu/drm/via/via_dmablit.c
··· 260 260 /* 261 261 * Allocate DMA capable memory for the blit descriptor chain, and an array that keeps track of the 262 262 * pages we allocate. We don't want to use kmalloc for the descriptor chain because it may be 263 - * quite large for some blits, and pages don't need to be contingous. 263 + * quite large for some blits, and pages don't need to be contiguous. 264 264 */ 265 265 266 266 static int
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
··· 227 227 * device-specific information. 228 228 * 229 229 * @sgt: Pointer to a struct sg_table with binding information 230 - * @num_regions: Number of regions with device-address contigous pages 230 + * @num_regions: Number of regions with device-address contiguous pages 231 231 */ 232 232 struct vmw_sg_table { 233 233 enum vmw_dma_map_mode mode;
+2 -2
drivers/input/touchscreen/ili210x.c
··· 216 216 /* get panel info */ 217 217 error = ili210x_read_reg(client, REG_PANEL_INFO, &panel, sizeof(panel)); 218 218 if (error) { 219 - dev_err(dev, "Failed to get panel informations, err: %d\n", 219 + dev_err(dev, "Failed to get panel information, err: %d\n", 220 220 error); 221 221 return error; 222 222 } ··· 276 276 277 277 error = input_register_device(priv->input); 278 278 if (error) { 279 - dev_err(dev, "Cannot regiser input device, err: %d\n", error); 279 + dev_err(dev, "Cannot register input device, err: %d\n", error); 280 280 goto err_remove_sysfs; 281 281 } 282 282
+1 -1
drivers/isdn/mISDN/dsp_cmx.c
··· 506 506 __func__, conf->id); 507 507 508 508 if (list_empty(&conf->mlist)) { 509 - printk(KERN_ERR "%s: conference whithout members\n", 509 + printk(KERN_ERR "%s: conference without members\n", 510 510 __func__); 511 511 return; 512 512 }
+1 -1
drivers/mailbox/arm_mhu.c
··· 96 96 IRQF_SHARED, "mhu_link", chan); 97 97 if (ret) { 98 98 dev_err(chan->mbox->dev, 99 - "Unable to aquire IRQ %d\n", mlink->irq); 99 + "Unable to acquire IRQ %d\n", mlink->irq); 100 100 return ret; 101 101 } 102 102
+1 -1
drivers/md/Kconfig
··· 478 478 This device-mapper target takes two devices, one device to use 479 479 normally, one to log all write operations done to the first device. 480 480 This is for use by file system developers wishing to verify that 481 - their fs is writing a consitent file system at all times by allowing 481 + their fs is writing a consistent file system at all times by allowing 482 482 them to replay the log in a variety of ways and to check the 483 483 contents. 484 484
+1 -1
drivers/media/dvb-frontends/au8522_dig.c
··· 922 922 MODULE_PARM_DESC(debug, "Enable verbose debug messages"); 923 923 924 924 module_param(zv_mode, int, 0644); 925 - MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatability mode (default:on).\n" 925 + MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatibility mode (default:on).\n" 926 926 "\t\ton - modified AU8522 QAM256 initialization.\n" 927 927 "\t\tProvides faster lock when using ZeeVee modulator based sources"); 928 928
+1 -1
drivers/media/platform/exynos4-is/fimc-m2m.c
··· 188 188 if (IS_ERR(f)) 189 189 return PTR_ERR(f); 190 190 /* 191 - * Return number of non-contigous planes (plane buffers) 191 + * Return number of non-contiguous planes (plane buffers) 192 192 * depending on the configured color format. 193 193 */ 194 194 if (!f->fmt)
+1 -1
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
··· 1734 1734 1735 1735 mfc_debug(1, "New context: %d\n", new_ctx); 1736 1736 ctx = dev->ctx[new_ctx]; 1737 - mfc_debug(1, "Seting new context to %p\n", ctx); 1737 + mfc_debug(1, "Setting new context to %p\n", ctx); 1738 1738 /* Got context to run in ctx */ 1739 1739 mfc_debug(1, "ctx->dst_queue_cnt=%d ctx->dpb_count=%d ctx->src_queue_cnt=%d\n", 1740 1740 ctx->dst_queue_cnt, ctx->pb_count, ctx->src_queue_cnt);
+1 -1
drivers/media/v4l2-core/videobuf2-memops.c
··· 125 125 } 126 126 127 127 /* 128 - * Memory is contigous, lock vma and return to the caller 128 + * Memory is contiguous, lock vma and return to the caller 129 129 */ 130 130 *res_vma = vb2_get_vma(vma); 131 131 if (*res_vma == NULL)
+1 -1
drivers/net/ethernet/amd/xgbe/xgbe.h
··· 140 140 141 141 #define XGBE_TX_MAX_BUF_SIZE (0x3fff & ~(64 - 1)) 142 142 143 - /* Descriptors required for maximum contigous TSO/GSO packet */ 143 + /* Descriptors required for maximum contiguous TSO/GSO packet */ 144 144 #define XGBE_TX_MAX_SPLIT ((GSO_MAX_SIZE / XGBE_TX_MAX_BUF_SIZE) + 1) 145 145 146 146 /* Maximum possible descriptors needed for an SKB:
+2 -2
drivers/net/wireless/ath/ath6kl/wmi.c
··· 154 154 } 155 155 156 156 /* Performs DIX to 802.3 encapsulation for transmit packets. 157 - * Assumes the entire DIX header is contigous and that there is 157 + * Assumes the entire DIX header is contiguous and that there is 158 158 * enough room in the buffer for a 802.3 mac header and LLC+SNAP headers. 159 159 */ 160 160 int ath6kl_wmi_dix_2_dot3(struct wmi *wmi, struct sk_buff *skb) ··· 449 449 450 450 /* 451 451 * Performs 802.3 to DIX encapsulation for received packets. 452 - * Assumes the entire 802.3 header is contigous. 452 + * Assumes the entire 802.3 header is contiguous. 453 453 */ 454 454 int ath6kl_wmi_dot3_2_dix(struct sk_buff *skb) 455 455 {
+1 -1
drivers/net/wireless/ipw2x00/ipw2100.h
··· 746 746 #define IPW_REG_GPIO IPW_REG_DOMAIN_0_OFFSET + 0x0030 747 747 #define IPW_REG_FW_TYPE IPW_REG_DOMAIN_1_OFFSET + 0x0188 748 748 #define IPW_REG_FW_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x018C 749 - #define IPW_REG_FW_COMPATABILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190 749 + #define IPW_REG_FW_COMPATIBILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190 750 750 751 751 #define IPW_REG_INDIRECT_ADDR_MASK 0x00FFFFFC 752 752
+1 -1
drivers/scsi/53c700.c
··· 299 299 memory = dma_alloc_noncoherent(hostdata->dev, TOTAL_MEM_SIZE, 300 300 &pScript, GFP_KERNEL); 301 301 if(memory == NULL) { 302 - printk(KERN_ERR "53c700: Failed to allocate memory for driver, detatching\n"); 302 + printk(KERN_ERR "53c700: Failed to allocate memory for driver, detaching\n"); 303 303 return NULL; 304 304 } 305 305
+1 -1
drivers/scsi/a100u2w.c
··· 888 888 scb->sense_len = SENSE_SIZE; 889 889 scb->cdb_len = cmd->cmd_len; 890 890 if (scb->cdb_len >= IMAX_CDB) { 891 - printk("max cdb length= %x\b", cmd->cmd_len); 891 + printk("max cdb length= %x\n", cmd->cmd_len); 892 892 scb->cdb_len = IMAX_CDB; 893 893 } 894 894 scb->ident = (u8)(cmd->device->lun & 0xff) | DISC_ALLOW;
+1 -1
drivers/scsi/aic7xxx/aic7xxx_core.c
··· 79 79 80 80 static const struct ahc_hard_error_entry ahc_hard_errors[] = { 81 81 { ILLHADDR, "Illegal Host Access" }, 82 - { ILLSADDR, "Illegal Sequencer Address referrenced" }, 82 + { ILLSADDR, "Illegal Sequencer Address referenced" }, 83 83 { ILLOPCODE, "Illegal Opcode in sequencer program" }, 84 84 { SQPARERR, "Sequencer Parity Error" }, 85 85 { DPARERR, "Data-path Parity Error" },
+1 -1
drivers/scsi/arcmsr/arcmsr_hba.c
··· 3264 3264 reg->doneq_index = 0; 3265 3265 writel(ARCMSR_MESSAGE_SET_POST_WINDOW, reg->drv2iop_doorbell); 3266 3266 if (!arcmsr_hbaB_wait_msgint_ready(acb)) { 3267 - printk(KERN_NOTICE "arcmsr%d:can not set diver mode\n", \ 3267 + printk(KERN_NOTICE "arcmsr%d: cannot set driver mode\n", \ 3268 3268 acb->host->host_no); 3269 3269 return 1; 3270 3270 }
+4 -4
drivers/scsi/fcoe/fcoe_transport.c
··· 58 58 module_param_call(create, fcoe_transport_create, NULL, 59 59 (void *)FIP_MODE_FABRIC, S_IWUSR); 60 60 __MODULE_PARM_TYPE(create, "string"); 61 - MODULE_PARM_DESC(create, " Creates fcoe instance on a ethernet interface"); 61 + MODULE_PARM_DESC(create, " Creates fcoe instance on an ethernet interface"); 62 62 63 63 module_param_call(create_vn2vn, fcoe_transport_create, NULL, 64 64 (void *)FIP_MODE_VN2VN, S_IWUSR); ··· 68 68 69 69 module_param_call(destroy, fcoe_transport_destroy, NULL, NULL, S_IWUSR); 70 70 __MODULE_PARM_TYPE(destroy, "string"); 71 - MODULE_PARM_DESC(destroy, " Destroys fcoe instance on a ethernet interface"); 71 + MODULE_PARM_DESC(destroy, " Destroys fcoe instance on an ethernet interface"); 72 72 73 73 module_param_call(enable, fcoe_transport_enable, NULL, NULL, S_IWUSR); 74 74 __MODULE_PARM_TYPE(enable, "string"); 75 - MODULE_PARM_DESC(enable, " Enables fcoe on a ethernet interface."); 75 + MODULE_PARM_DESC(enable, " Enables fcoe on an ethernet interface."); 76 76 77 77 module_param_call(disable, fcoe_transport_disable, NULL, NULL, S_IWUSR); 78 78 __MODULE_PARM_TYPE(disable, "string"); 79 - MODULE_PARM_DESC(disable, " Disables fcoe on a ethernet interface."); 79 + MODULE_PARM_DESC(disable, " Disables fcoe on an ethernet interface."); 80 80 81 81 /* notification function for packets from net device */ 82 82 static struct notifier_block libfcoe_notifier = {
+1 -1
drivers/scsi/scsi_transport_iscsi.c
··· 3037 3037 3038 3038 shost = scsi_host_lookup(ev->u.get_chap.host_no); 3039 3039 if (!shost) { 3040 - printk(KERN_ERR "%s: failed. Cound not find host no %u\n", 3040 + printk(KERN_ERR "%s: failed. Could not find host no %u\n", 3041 3041 __func__, ev->u.get_chap.host_no); 3042 3042 return -ENODEV; 3043 3043 }
+2 -2
drivers/scsi/scsi_transport_spi.c
··· 786 786 * IU, then QAS (if we can control them), then finally 787 787 * fall down the periods */ 788 788 if (i->f->set_iu && spi_iu(starget)) { 789 - starget_printk(KERN_ERR, starget, "Domain Validation Disabing Information Units\n"); 789 + starget_printk(KERN_ERR, starget, "Domain Validation Disabling Information Units\n"); 790 790 DV_SET(iu, 0); 791 791 } else if (i->f->set_qas && spi_qas(starget)) { 792 - starget_printk(KERN_ERR, starget, "Domain Validation Disabing Quick Arbitration and Selection\n"); 792 + starget_printk(KERN_ERR, starget, "Domain Validation Disabling Quick Arbitration and Selection\n"); 793 793 DV_SET(qas, 0); 794 794 } else { 795 795 newperiod = spi_period(starget);
+1 -1
drivers/scsi/wd719x.c
··· 590 590 dev_dbg(&wd->pdev->dev, "selection timeout\n"); 591 591 break; 592 592 case WD719X_SUE_RESET: 593 - dev_dbg(&wd->pdev->dev, "bus reset occured\n"); 593 + dev_dbg(&wd->pdev->dev, "bus reset occurred\n"); 594 594 result = DID_RESET; 595 595 break; 596 596 case WD719X_SUE_BUSERROR:
+1 -1
drivers/usb/dwc2/core.c
··· 3175 3175 hw->hs_phy_type); 3176 3176 dev_dbg(hsotg->dev, " fs_phy_type=%d\n", 3177 3177 hw->fs_phy_type); 3178 - dev_dbg(hsotg->dev, " utmi_phy_data_wdith=%d\n", 3178 + dev_dbg(hsotg->dev, " utmi_phy_data_width=%d\n", 3179 3179 hw->utmi_phy_data_width); 3180 3180 dev_dbg(hsotg->dev, " num_dev_ep=%d\n", 3181 3181 hw->num_dev_ep);
+1 -1
drivers/usb/gadget/udc/bdc/bdc.h
··· 290 290 __le32 offset[4]; 291 291 }; 292 292 293 - /* bd_table: contigous bd's in a table */ 293 + /* bd_table: contiguous bd's in a table */ 294 294 struct bd_table { 295 295 struct bdc_bd *start_bd; 296 296 /* dma address of start bd of table*/
+1 -1
drivers/w1/masters/matrox_w1.c
··· 40 40 41 41 MODULE_LICENSE("GPL"); 42 42 MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>"); 43 - MODULE_DESCRIPTION("Driver for transport(Dallas 1-wire prtocol) over VGA DDC(matrox gpio)."); 43 + MODULE_DESCRIPTION("Driver for transport(Dallas 1-wire protocol) over VGA DDC(matrox gpio)."); 44 44 45 45 static struct pci_device_id matrox_w1_tbl[] = { 46 46 { PCI_DEVICE(PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G400) },
+1 -1
fs/btrfs/qgroup.c
··· 376 376 qgroup = find_qgroup_rb(fs_info, found_key.offset); 377 377 if ((qgroup && found_key.type == BTRFS_QGROUP_INFO_KEY) || 378 378 (!qgroup && found_key.type == BTRFS_QGROUP_LIMIT_KEY)) { 379 - btrfs_err(fs_info, "inconsitent qgroup config"); 379 + btrfs_err(fs_info, "inconsistent qgroup config"); 380 380 flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; 381 381 } 382 382 if (!qgroup) {
+1 -1
fs/ecryptfs/mmap.c
··· 299 299 rc = ecryptfs_read_lower_page_segment( 300 300 page, index, 0, PAGE_CACHE_SIZE, mapping->host); 301 301 if (rc) { 302 - printk(KERN_ERR "%s: Error attemping to read " 302 + printk(KERN_ERR "%s: Error attempting to read " 303 303 "lower page segment; rc = [%d]\n", 304 304 __func__, rc); 305 305 ClearPageUptodate(page);
+1 -1
fs/freevxfs/vxfs_lookup.c
··· 192 192 * by @dp in @dip. 193 193 * 194 194 * Returns: 195 - * A NULL-pointer on success, else an negative error code encoded 195 + * A NULL-pointer on success, else a negative error code encoded 196 196 * in the return pointer. 197 197 */ 198 198 static struct dentry *
+1 -1
fs/ntfs/super.c
··· 543 543 return -EROFS; 544 544 } 545 545 if (!ntfs_stamp_usnjrnl(vol)) { 546 - ntfs_error(sb, "Failed to stamp transation log " 546 + ntfs_error(sb, "Failed to stamp transaction log " 547 547 "($UsnJrnl)%s", es); 548 548 NVolSetErrors(vol); 549 549 return -EROFS;
+2 -2
fs/ocfs2/ocfs2_fs.h
··· 168 168 /* Refcount tree support */ 169 169 #define OCFS2_FEATURE_INCOMPAT_REFCOUNT_TREE 0x1000 170 170 171 - /* Discontigous block groups */ 171 + /* Discontiguous block groups */ 172 172 #define OCFS2_FEATURE_INCOMPAT_DISCONTIG_BG 0x2000 173 173 174 174 /* ··· 939 939 /* 940 940 * Block groups may be discontiguous when 941 941 * OCFS2_FEATURE_INCOMPAT_DISCONTIG_BG is set. 942 - * The extents of a discontigous block group are 942 + * The extents of a discontiguous block group are 943 943 * stored in bg_list. It is a flat list. 944 944 * l_tree_depth must always be zero. A 945 945 * discontiguous group is signified by a non-zero
+1 -1
include/linux/mod_devicetable.h
··· 253 253 254 254 __u32 prod_id_hash[4]; 255 255 256 - /* not matched against in kernelspace*/ 256 + /* not matched against in kernelspace */ 257 257 const char * prod_id[4]; 258 258 259 259 /* not matched against */
+1 -1
include/linux/proportions.h
··· 33 33 /* 34 34 * global proportion descriptor 35 35 * 36 - * this is needed to consitently flip prop_global structures. 36 + * this is needed to consistently flip prop_global structures. 37 37 */ 38 38 struct prop_descriptor { 39 39 int index;
+1 -1
include/media/videobuf-core.h
··· 37 37 * 38 38 * about the mmap helpers (videobuf_mmap_*): 39 39 * 40 - * The mmaper function allows to map any subset of contingous buffers. 40 + * The mmaper function allows to map any subset of contiguous buffers. 41 41 * This includes one mmap() call for all buffers (which the original 42 42 * video4linux API uses) as well as one mmap() for every single buffer 43 43 * (which v4l2 uses).
+1 -1
kernel/exit.c
··· 1471 1471 add_wait_queue(&current->signal->wait_chldexit, &wo->child_wait); 1472 1472 repeat: 1473 1473 /* 1474 - * If there is nothing that can match our critiera just get out. 1474 + * If there is nothing that can match our criteria, just get out. 1475 1475 * We will clear ->notask_error to zero if we see any child that 1476 1476 * might later match our criteria, even if we are not able to reap 1477 1477 * it yet.
+5 -5
mm/nommu.c
··· 324 324 } 325 325 326 326 /* 327 - * vmalloc - allocate virtually continguos memory 327 + * vmalloc - allocate virtually contiguous memory 328 328 * 329 329 * @size: allocation size 330 330 * 331 331 * Allocate enough pages to cover @size from the page level 332 - * allocator and map them into continguos kernel virtual space. 332 + * allocator and map them into contiguous kernel virtual space. 333 333 * 334 334 * For tight control over page level allocator and protection flags 335 335 * use __vmalloc() instead. ··· 341 341 EXPORT_SYMBOL(vmalloc); 342 342 343 343 /* 344 - * vzalloc - allocate virtually continguos memory with zero fill 344 + * vzalloc - allocate virtually contiguous memory with zero fill 345 345 * 346 346 * @size: allocation size 347 347 * 348 348 * Allocate enough pages to cover @size from the page level 349 - * allocator and map them into continguos kernel virtual space. 349 + * allocator and map them into contiguous kernel virtual space. 350 350 * The memory allocated is set to zero. 351 351 * 352 352 * For tight control over page level allocator and protection flags ··· 420 420 * @size: allocation size 421 421 * 422 422 * Allocate enough 32bit PA addressable pages to cover @size from the 423 - * page level allocator and map them into continguos kernel virtual space. 423 + * page level allocator and map them into contiguous kernel virtual space. 424 424 */ 425 425 void *vmalloc_32(unsigned long size) 426 426 {
+1 -1
sound/soc/fsl/fsl_esai.c
··· 517 517 u32 bclk, mask, val; 518 518 int ret; 519 519 520 - /* Override slot_width if being specifially set */ 520 + /* Override slot_width if being specifically set */ 521 521 if (esai_priv->slot_width) 522 522 slot_width = esai_priv->slot_width; 523 523
+1 -1
sound/soc/omap/Kconfig
··· 24 24 component also under DSS HDMI device. Dummy codec is used as 25 25 as codec component. The hdmi audio driver implements also 26 26 the card and registers it under its own platform device. 27 - The device for the dirver is registered by OMAPDSS hdmi 27 + The device for the driver is registered by OMAPDSS hdmi 28 28 driver. 29 29 30 30 config SND_OMAP_SOC_N810