Merge branch 'linus' into timers/urgent
authorThomas Gleixner <tglx@linutronix.de>
Tue, 14 Nov 2017 09:01:49 +0000 (10:01 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 14 Nov 2017 09:01:49 +0000 (10:01 +0100)
Get upstream changes so dependent patches can be applied.

1  2 
include/linux/timekeeping.h

Simple merge