]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 May 2017 02:09:35 +0000 (19:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 May 2017 02:09:35 +0000 (19:09 -0700)
Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  tty: fix comment for __tty_alloc_driver()
  init/main: properly align the multi-line comment
  init/main: Fix double "the" in comment
  Fix dead URLs to ftp.kernel.org
  drivers: Clean up duplicated email address
  treewide: Fix typo in xml/driver-api/basics.xml
  tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall"
  selftests/timers: Spelling s/privledges/privileges/
  HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/
  net: phy: dp83848: Fix Typo
  UBI: Fix typos
  Documentation: ftrace.txt: Correct nice value of 120 priority
  net: fec: Fix typo in error msg and comment
  treewide: Fix typos in printk

12 files changed:
1  2 
MAINTAINERS
drivers/block/Kconfig
drivers/net/ethernet/freescale/fec_main.c
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
drivers/pinctrl/pinctrl-amd.c
include/linux/sched.h
init/main.c
kernel/sched/fair.c
kernel/time/hrtimer.c
kernel/time/timer.c
tools/perf/builtin-probe.c
tools/testing/selftests/powerpc/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge