]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit98c09e3e23363d44257198d6a80c1c93557a42b5
tree7b18cca93a853b253375d0a3f1cb5af242771768
parent0728d2ddb7171cdf8ebbfe19fc88ce24c2cb1138
parentbb4aaa3c9dfad1d655e0d0f2cc20f66e879dcc1f
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