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)
commitd4bfeabe9ff7967f4b8c24aabf2de1ce3a909cd9
tree6b419b8497c7d57ddec20a3558697ef36ea37b11
parent8a7a8e1eab929eb3a5b735a788a23b9731139046
parentb29c6ef7bb1257853c1e31616d84f55e561cf631
Merge branch 'linus' into timers/urgent

Get upstream changes so dependent patches can be applied.
include/linux/timekeeping.h