Merge branch 'linus' into timers/2038
authorThomas Gleixner <tglx@linutronix.de>
Sat, 19 May 2018 11:55:40 +0000 (13:55 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 19 May 2018 11:55:40 +0000 (13:55 +0200)
commitb563ea676a46f3a297b1e64b6ece25b934aafba5
tree7b18cca93a853b253375d0a3f1cb5af242771768
parent4fe581d7f114d56f31f392448477cff5a4394065
parent73fcb1a370c76b202d406e95d9dabb76eaccf484
Merge branch 'linus' into timers/2038

Merge upstream to pick up changes on which pending patches depend on.
arch/Kconfig
arch/x86/events/core.c
arch/x86/include/asm/ftrace.h
drivers/s390/net/qeth_core_main.c
include/uapi/linux/time.h
kernel/compat.c
kernel/time/hrtimer.c
kernel/time/posix-stubs.c
kernel/time/posix-timers.c