Merge tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux...

Pull ia64 update from Tony Luck:
 "Stop ia64 being the last holdout using GENERIC_TIME_VSYSCALL_OLD so
  that John Stultz can drop that code"

* tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: Update fsyscall gettime to use modern vsyscall_update

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/ia64/kernel/asm-offsets.c
Simple merge

diff --cc arch/ia64/kernel/fsys.S
Simple merge

diff --cc arch/ia64/kernel/fsyscall_gtod_data.h
Simple merge