Merge branch 'timers/urgent' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Wed, 2 May 2018 14:11:12 +0000 (16:11 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 2 May 2018 14:11:12 +0000 (16:11 +0200)
commit604a98f1df2897f9ea6ca6bdab8e1c2d6844be01
tree99471700986d14cd5cace3e535dfcbd0e07464cb
parent1cfd904f16740df21b2df7b41c7a0dc00cbd434c
parent7dba33c6346c337aac3f7cd188137d4a6d3d1f3a
Merge branch 'timers/urgent' into timers/core

Pick up urgent fixes to apply dependent cleanup patch
arch/x86/include/asm/ftrace.h
drivers/s390/net/qeth_core_main.c
include/uapi/linux/time.h
kernel/time/hrtimer.c
kernel/time/posix-stubs.c
kernel/time/posix-timers.c