]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Jun 2015 21:08:54 +0000 (14:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Jun 2015 21:08:54 +0000 (14:08 -0700)
commitcb8a4deaf9b2778653c4391d8ccb24c5ab159f9d
treec563a7465823615734c82cf27c48f27a88d92d5f
parent0faef837e431b4984652f4a14d2075bed108a04d
parent79ce48df755e6a5231cc1ac515e7988e1d715ce1
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
 "As usual, mostly comment, kerneldoc and printk() fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  lpfc: Grammar s/an negative/a negative/
  ARM: lib/lib1funcs.S: fix typo s/substractions/subtractions/
  cx25821: cx25821-medusa-reg.h: fix 0x0x prefix
  lib: crc-itu-t.[ch] fix 0x0x prefix in integer constants
  rapidio: Fix kerneldoc and comment
  qla4xxx: Fix printk() in qla4_83xx_read_reset_template() and qla4_83xx_pre_loopback_config()
  treewide: Kconfig: fix wording / spelling
  usb/serial: fix grammar in Kconfig help text for FTDI_SIO
  megaraid_sas: fix kerneldoc
  netfilter: ebtables: fix comment grammar
  drm/radeon: fix comment
  isdn: fix grammar in comment
  ARM: KVM: fix comment
13 files changed:
arch/arm/include/asm/kvm_asm.h
arch/arm64/include/asm/kvm_asm.h
arch/xtensa/Kconfig
drivers/isdn/i4l/isdn_net.c
drivers/platform/x86/Kconfig
drivers/scsi/Kconfig
drivers/scsi/lpfc/lpfc_debugfs.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/megaraid/megaraid_sas_fusion.c
drivers/usb/serial/Kconfig
include/linux/netfilter_bridge/ebtables.h
include/uapi/linux/netfilter_bridge/ebtables.h
net/bridge/netfilter/ebtables.c