]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Nov 2017 18:14:11 +0000 (10:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Nov 2017 18:14:11 +0000 (10:14 -0800)
commit9682b3dea22190a6fd449d157e3175b0e748684d
tree1b4d01168142fbb006e16b40e669de9737eb69ee
parent20df15783a44a289aaa8c8f83b3f715f9040c9c2
parent1972d6c0c86dd8620ff9f2811ce875135ffb5405
Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
 "The usual rocket-science from trivial tree for 4.15"

* 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  MAINTAINERS: relinquish kconfig
  MAINTAINERS: Update my email address
  treewide: Fix typos in Kconfig
  kfifo: Fix comments
  init/Kconfig: Fix module signing document location
  misc: ibmasm: Return error on error path
  HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback"
  MAINTAINERS: Correct path to uDraw PS3 driver
  tracing: Fix doc mistakes in trace sample
  tracing: Kconfig text fixes for CONFIG_HWLAT_TRACER
  MIPS: Alchemy: Remove reverted CONFIG_NETLINK_MMAP from db1xxx_defconfig
  mm/huge_memory.c: fixup grammar in comment
  lib/xz: Add fall-through comments to a switch statement
12 files changed:
MAINTAINERS
arch/alpha/Kconfig
arch/arm/mach-bcm/Kconfig
arch/arm64/Kconfig
arch/powerpc/platforms/Kconfig
arch/unicore32/Kconfig
arch/xtensa/Kconfig
drivers/power/supply/Kconfig
drivers/scsi/Kconfig
init/Kconfig
mm/huge_memory.c
samples/trace_events/trace-events-sample.h