diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-10-25 23:22:48 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-10-25 23:22:54 +0000 |
| commit | b139c4a14223e5c2ba1f345849e6c0c1028fad13 (patch) | |
| tree | 2f5cb8d1ff11d18d99a14e39b7ad1c37cb0313a8 /usr/src/man/man7d | |
| parent | e32908d7f87dab713a639f67a0ea4f41d037db05 (diff) | |
| parent | 8bf58058bb64c24ccf6da9141b2f10037725b137 (diff) | |
| download | illumos-joyent-b139c4a14223e5c2ba1f345849e6c0c1028fad13.tar.gz | |
[illumos-gate merge]
commit 8bf58058bb64c24ccf6da9141b2f10037725b137
3881 want device driver for HP SmartArray RAID controllers (fix packaging)
commit 6750ebac18fffc872e3e2c643732f448b14f5195
4167 EOF pcser (fix sparc exception)
commit e1b09d8049c010cce1944b6c61b253a64aa1459b
4072 make clobber leaves trash (fix sparc)
commit 90485377c865d59d1f5371960ae60cee3b580421
4215 pkcs11_tpm botches shared library initialization, murders its friends
commit 90c14341d8cb7aed572c1120e9674f8c2a7e5ffa
4034 'dmake all' fails for DTrace demos
commit 5110237a5c8166de8ba374fce724cf2ab8758812
4030 remove useless nightly/bldenv options
commit c0e7977a434048a8bc7386ea0e8befaa77a646cf
4027 remove CLOSED_BUILD
4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Conflicts:
usr/src/tools/scripts/bldenv.sh (OS-2094)
Diffstat (limited to 'usr/src/man/man7d')
| -rw-r--r-- | usr/src/man/man7d/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/man/man7d/Makefile b/usr/src/man/man7d/Makefile index 8922d97ed8..806d6521b6 100644 --- a/usr/src/man/man7d/Makefile +++ b/usr/src/man/man7d/Makefile @@ -33,7 +33,6 @@ _MANFILES= aac.7d \ bscv.7d \ chxge.7d \ console.7d \ - cpqary3.7d \ cpuid.7d \ dca.7d \ dcam1394.7d \ @@ -207,6 +206,7 @@ i386_MANFILES= ahci.7d \ bcm_sata.7d \ bfe.7d \ cmdk.7d \ + cpqary3.7d \ dnet.7d \ ecpp.7d \ heci.7d \ |