4158 want getifaddrs manual page
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
3830 SIGQUEUE_MAX's limit of 32 is too low
Reviewed by: Cedric Blancher <cedric.blancher@gmail.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: Irek Szczesniak <iszczesniak@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
3881 want device driver for HP SmartArray RAID controllers
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Eric Sproul <esproul@omniti.com>
Reviewed by: ken mays <maybird1776@yahoo.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
4091 e1000g I217/I218 support
4092 Intel 1GBe NIC common code should be shared
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
4090 igb I210/I211 support
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
	[illumos-gate merge]

commit 6ed0a5cff079e25f4aa15cef67c6dd48ee60b018
    4090 igb I210/I211 support
commit 75eba5b6d79ed4d2ce3daf7b2806306b6b69a938
    4091 e1000g I217/I218 support
    4092 Intel 1GBe NIC common code should be shared
commit 80c94ecd7a524eb933a4bb221a9618b9dc490e76
    3881 want device driver for HP SmartArray RAID controllers
commit 5e989a96186a37eb528fb7bb4d28a150874ec799
    3830 SIGQUEUE_MAX's limit of 32 is too low
commit b9476f453004695da12eaaff383ed9005e7a47c4
    4158 want getifaddrs manual page

Conflicts:
	usr/src/man/man5/resource_controls.5
	usr/src/man/man7d/cpqary3.7d
	usr/src/pkg/manifests/driver-storage-cpqary3.mf
	usr/src/uts/common/io/cpqary3/cpqary3.c
	usr/src/uts/common/Makefile.files
	usr/src/uts/intel/cpqary3/Makefile

Manifests:
	usr/src/pkg/manifests/driver-network-e1000g.mf
	usr/src/pkg/manifests/driver-network-igb.mf