Merge branch 'timers/vfs' into timers/core

Pick up the VFS specific interfaces so further timekeeping changes can be
based on them.

diff --cc include/linux/timekeeping.h
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge