summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/ntpd/ntp_control.c
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-09-12 11:41:31 +0000
committerbapt <bapt@FreeBSD.org>2015-09-12 11:41:31 +0000
commitb59c5e751e5e8badbb23510e7df005b7de4014a3 (patch)
tree60c693416bb4f18491c1fcc6b486930fcd9f4ef1 /contrib/ntp/ntpd/ntp_control.c
parentbb8dfd5e7e9ae9f11af6d8bc1e6993e7490d8530 (diff)
parente4e49c92c2b26fd037b2de594b7183265a656b12 (diff)
parentceb1e1488d523eff8fa06828cf0511fc2556c0ef (diff)
downloadFreeBSD-src-b59c5e751e5e8badbb23510e7df005b7de4014a3.zip
FreeBSD-src-b59c5e751e5e8badbb23510e7df005b7de4014a3.tar.gz
Merge from head
OpenPOWER on IntegriCloud