diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-24 14:07:14 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-24 14:07:14 +0000 |
| commit | 72313197becf405ef4e91a54aa4691e4a55868d1 (patch) | |
| tree | f268b3723d709ebdc46bf2136291cd04b27f7650 /usr/src/man/man1m/Makefile | |
| parent | 9812695da2de32f90ea47ba21e78e29437e4de8f (diff) | |
| parent | a2e92fdb91a6e5451ecb5488b74ee1e95a4bafd0 (diff) | |
| download | illumos-joyent-72313197becf405ef4e91a54aa4691e4a55868d1.tar.gz | |
[illumos-gate merge]
commit a2e92fdb91a6e5451ecb5488b74ee1e95a4bafd0
11691 ptree could show service FMRIs
commit 3ef756924267e272e432add760e4dc8597faef89
11849 listen of IPv6 address fails with EAFNOSUPPORT
commit 125965389c591835d37b560971900f263cc8f988
11844 add rdmsr utility
Conflicts:
usr/src/man/man1m/Makefile
usr/src/man/man1/ptree.1
usr/src/cmd/ptools/ptree/ptree.c
Diffstat (limited to 'usr/src/man/man1m/Makefile')
| -rw-r--r-- | usr/src/man/man1m/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/man/man1m/Makefile b/usr/src/man/man1m/Makefile index 42fcdf1e64..eae46cdb4c 100644 --- a/usr/src/man/man1m/Makefile +++ b/usr/src/man/man1m/Makefile @@ -11,7 +11,7 @@ # # Copyright 2011, Richard Lowe -# Copyright 2016 Joyent, Inc. +# Copyright 2019 Joyent, Inc. # Copyright 2015 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2013, 2016 by Delphix. All rights reserved. # Copyright 2016 Toomas Soome <tsoome@me.com> @@ -548,6 +548,7 @@ i386_MANFILES= \ acpixtract.1m \ nvmeadm.1m \ pptadm.1m + rdmsr.1m sparc_MANFILES= dcs.1m \ drd.1m \ |