Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-next to receive ========== - usual stuff from trivial tree for 4.3 (kerneldoc updates, printk() fixes, Documentation and MAINTAINERS updates). ========== You are going to receive an easy-to-solve conflict (patch for drivers/regulator/max77843.c, which is a driver that has already been removed in your tree, so that hunk can be just dropped). Thanks. ---------------------------------------------------------------- Benjamin Herr (1): Doc: fix trivial typo in SubmittingPatches Colin Ian King (1): scsi: a100u2w: trivial typo in printk Diego Viola (2): drivers/usb/gadget/composite.c: i18n is not an acronym README: GTK+ is a acronym Frans Klaver (2): kernel: exit: fix typo in comment mod_devicetable: add space before */ Geert Uytterhoeven (6): ASoC: fsl_esai: Spelling s/specifially/specifically/ freevxfs: Grammar s/an negative/a negative/ Btrfs: Spelling s/consitent/consistent/ staging: comedi: Grammar s/Enable support a/Enable support for a/ dm: Spelling s/consitent/consistent/ proportions: Spelling s/consitent/consistent/ Jiri Kosina (1): MAINTAINERS: update my e-mail address Laurent Pinchart (1): treewide: Fix typo compatability -> compatibility Masahiro Yamada (1): treewide: fix typos in comment blocks Masanari Iida (6): treewide: Fix typo in printk w1: Fix typo in MODULE_DESCRIPTION in matrox_w1.c scsi:fcoe: Fix typo "a ethernet" in fcoe_transport.c [SCSI] Fix printk typos in drivers/scsi drm/nouveau/gr: Fix typo in nv10.c i2c: Fix typo in i2c-bfin-twi.c Nik Nyby (7): fix typo in Documentation/SubmittingPatches ntfs: super.c: Fix error log mm: tlb.c: Fix error message ASoC: omap: Fix typo in config option description scsi/arcmsr: Fix typos in error log pcmcia: Fix typo in locking documentation aic7xxx: Fix typo in error message Documentation/SubmittingPatches | 4 ++-- Documentation/pcmcia/locking.txt | 2 +- MAINTAINERS | 18 +++++++++--------- README | 2 +- arch/ia64/mm/tlb.c | 4 ++-- arch/metag/include/asm/elf.h | 2 +- arch/mips/kernel/setup.c | 2 +- arch/powerpc/kvm/book3s.c | 2 +- arch/powerpc/sysdev/fsl_pci.c | 2 +- arch/sparc/include/uapi/asm/pstate.h | 2 +- drivers/crypto/img-hash.c | 2 +- drivers/gpio/gpiolib-acpi.c | 2 +- drivers/gpu/drm/drm_atomic_helper.c | 4 ++-- drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c | 4 ++-- drivers/gpu/drm/via/via_dmablit.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +- drivers/i2c/busses/i2c-bfin-twi.c | 4 ++-- drivers/input/touchscreen/ili210x.c | 4 ++-- drivers/isdn/mISDN/dsp_cmx.c | 2 +- drivers/mailbox/arm_mhu.c | 2 +- drivers/md/Kconfig | 2 +- drivers/media/dvb-frontends/au8522_dig.c | 2 +- drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 +- drivers/media/v4l2-core/videobuf2-memops.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +- drivers/net/wireless/ath/ath6kl/wmi.c | 4 ++-- drivers/net/wireless/ipw2x00/ipw2100.h | 2 +- drivers/regulator/max77843.c | 2 +- drivers/scsi/53c700.c | 2 +- drivers/scsi/a100u2w.c | 2 +- drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- drivers/scsi/fcoe/fcoe_transport.c | 8 ++++---- drivers/scsi/scsi_transport_iscsi.c | 2 +- drivers/scsi/scsi_transport_spi.c | 4 ++-- drivers/scsi/wd719x.c | 2 +- drivers/staging/comedi/Kconfig | 2 +- drivers/usb/dwc2/core.c | 2 +- drivers/usb/gadget/composite.c | 4 ++-- drivers/usb/gadget/udc/bdc/bdc.h | 2 +- drivers/w1/masters/matrox_w1.c | 2 +- fs/btrfs/qgroup.c | 2 +- fs/ecryptfs/mmap.c | 2 +- fs/freevxfs/vxfs_lookup.c | 2 +- fs/ntfs/super.c | 2 +- fs/ocfs2/ocfs2_fs.h | 4 ++-- include/linux/mod_devicetable.h | 2 +- include/linux/proportions.h | 2 +- include/media/videobuf-core.h | 2 +- kernel/exit.c | 2 +- mm/nommu.c | 10 +++++----- sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/omap/Kconfig | 2 +- 54 files changed, 79 insertions(+), 79 deletions(-) -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/