4166 EOF pcata
4167 EOF pcser
2995 pcan and pcwl wifi device drivers EOL
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gordon.ross@nexenta.com>
4120 /etc/mach and 32-bit sd belong in system/kernel
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Andy Stormont <AStormont@racktopsystems.com>
Approved by: Gordon Ross <gordon.ross@nexenta.com>
OS-2546 missing code path for incrementing fork fail kstats
	[illumos-gate merge]

commit 4f9a6360ccbecd9ff675131a0d72925cdde1b18b
    4120 /etc/mach and 32-bit sd belong in system/kernel
commit 506aa7c68b127eefb0197e329af7e9abcc3ebc98
    4166 EOF pcata
    4167 EOF pcser
    2995 pcan and pcwl wifi device drivers EOL
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec

Conflicts:
	exception_lists/closed-bins