3788 /etc/bootrc is defunct and should be removed
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>>
Approved by: Richard Lowe <richlowe@richlowe.net>
3036 Update hwdata to current upstream data
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Ken Mays <maybird1776@yahoo.com>
Approved by: Robert Mustacchi <rm@joyent.com>
3837 Get rid of custom getln() implementation from whois.c Reviewed by: Marcel Telka <marcel@telka.sk> Reviewed by: Yuri Pankov <yuri@xvoid.org>
3820 /usr/bin/sed doesn't handle binary files. Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net> Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Marcel Telka <marcel@telka.sk>
3815 AHCI: Support for Marvell 88SE9128 Reviewed by: Johann 'Myrkraverk' Oskarsson <johann@myrkraverk.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Garrett D'Amore <garrett@damore.org>
3814 Support for SATA III Reviewed by: Johann 'Myrkraverk' Oskarsson <johann@myrkraverk.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Garrett D'Amore <garrett@damore.org>
	[illumos-gate merge]

	commit 13c8743e4d3cc6d9653687512c0d48d2b653513d
	    3814 Support for SATA III
	    Reviewed by: Johann 'Myrkraverk' Oskarsson <johann@myrkraverk.com>
	    Reviewed by: Richard Lowe <richlowe@richlowe.net>
	    Reviewed by: Garrett D'Amore <garrett@damore.org>
	commit 257c04ecb24858f6d68020a41589306f554ea434
	    3815 AHCI: Support for Marvell 88SE9128
	    Reviewed by: Johann 'Myrkraverk' Oskarsson <johann@myrkraverk.com>
	    Reviewed by: Richard Lowe <richlowe@richlowe.net>
	    Reviewed by: Garrett D'Amore <garrett@damore.org>
	commit 9384cec630155c229c70dfb8a445c6ccf433045a
	    3820 /usr/bin/sed doesn't handle binary files.
	    Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	    Reviewed by: Richard Lowe <richlowe@richlowe.net>
	    Reviewed by: Marcel Telka <marcel@telka.sk>
	commit deeb0f36019670ade13450cb986b946c2e4002e6
	    3837 Get rid of custom getln() implementation from whois.c
	    Reviewed by: Marcel Telka <marcel@telka.sk>
	    Reviewed by: Yuri Pankov <yuri@xvoid.org>
	commit 588ef7d7682af16db66cd51d457078fea0519e47
	    3036 Update hwdata to current upstream data
	commit 0f24ff92c543e3909da566a91add6a92bcad02ed
	    3788 /etc/bootrc is defunct and should be removed

	Conflict: usr/src/cmd/hwdata/pci.ids
	Conflict: usr/src/cmd/prtconf/prtconf.c
	Manifest: usr/src/pkg/manifests/driver-network-platform.mf