4669 cpqary3 driver does not see drives on P400 Smart-Array
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
4596 Callers of ip_srcid_find_id() need to be more careful (mismerge)
4650 nfssrv module is left half-initialized if mod_install(9f) fails
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
4652 Add support for the Areca 1882
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@omniti.com>
2052 iiadm(1M) incorrectly describes group removal
Reviewed by: Adam Stevko <adam.stevko@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
	[illumos-gate merge]

commit f430eb3a41177f2eb1360599331628b0ad9acb51
    2052 iiadm(1M) incorrectly describes group removal
commit 7d14b8f218dc86a431d15e352b4bf15fbb1b3596
    4652 Add support for the Areca 1882
commit 41bec5e379cee655ed15b8f2cf031e24aefb9d36
    4650 nfssrv module is left half-initialized if mod_install(9f) fails
commit 624038333cc8b9753aa708419ef700fe0fd2ffa3
    4596 Callers of ip_srcid_find_id() need to be more careful (mismerge)
commit cb4d2fc89a3412669ae5ad0126ddbf6501c7ce39
    4669 cpqary3 driver does not see drives on P400 Smart-Array

Conflicts:
	usr/src/uts/common/fs/nfs/nfs_server.c (copyright)