Merge branch 'monotonic-time' of https://github.com/themiron/ppp

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --cc pppd/Makefile.linux
Simple merge

diff --cc pppd/main.c
Simple merge

diff --cc pppd/pppd.h
Simple merge

diff --cc pppd/sys-linux.c
Simple merge

diff --cc pppd/sys-solaris.c
Simple merge

diff --cc pppd/tty.c
Simple merge