3799 ddi_ffs(9f): typo in function prototype
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
OS-2257 unusable SSL libraries should have different names in the platform
OS-2285 platform contains a few broken symlinks
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec
	[illumos-gate merge]

commit 480bbe0b214df229f324a7a7ba1947025184eb83
    3799 ddi_ffs(9f): typo in function prototype
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec