some note updates from jsg

8 files changed, 1047 insertions, 317 deletions

diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 014a9b6d263..9fa6d6b817b 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.84 2007/03/01 19:17:44 miod Exp $
+dnl	$OpenBSD: hardware,v 1.85 2007/03/09 22:43:37 deraadt Exp $
 OpenBSD/MACHINE OSREV is expected to run on the following hardware.
 If you have hardware that is listed here and are unable to run
 OpenBSD, or if you are able to run OpenBSD on hardware not listed
@@ -312,12 +312,16 @@ Supported Peripherals:
 		including: [*]
 		    HP ProLiant NC310F PCI-X Gigabit NIC (SX Fiber)
 		    HP ProLiant NC340T PCI-X Gigabit NIC
+		    HP ProLiant NC360T PCI Express Dual Port Gigabit NIC
+		    HP ProLiant NC6132 Upgrade Module (SX Fiber)
+		    HP ProLiant NC6133 Upgrade Module (LX Fiber)
 		    HP ProLiant NC6134 PCI Gigabit NIC (SX Fiber)
 		    HP ProLiant NC6136 PCI Gigabit NIC (SX Fiber)
 		    HP ProLiant NC6170 PCI-X Gigabit NIC (SX Fiber)
 		    HP ProLiant NC7131 PCI Gigabit NIC
-		    HP ProLiant NC7170 PCI-X Gigabit NIC
-		    HP ProLiant NC7170LP PCI-X Gigabit NIC
+		    HP ProLiant NC7132 Upgrade Module
+		    HP ProLiant NC7170 PCI-X Dual Port Gigabit NIC
+		    HP ProLiant NC7170LP PCI-X Dual Port Gigabit NIC
 		    Intel PRO/1000 Gigabit Server Adapter (SX Fiber)
 		      (PWLA8490)
 		    Intel PRO/1000F Gigabit Server Adapter (SX Fiber)
@@ -335,6 +339,13 @@ Supported Peripherals:
 		      (PWLA8492MF)
 		    Intel PRO/1000MF Server Adapter (LX Fiber) (PWLA8490LX)
 		    Intel PRO/1000MT Quad PCI-X Adapter (PWLA8494MT)
+		    Intel PRO/1000GT Quad PCI-X Adapter (PWLA8494GT)
+		    Intel PRO/1000PT Desktop Adapter
+		    Intel PRO/1000PT Server Adapter
+		    Intel PRO/1000PT Dual Port Server Adapter
+		    Intel PRO/1000PT Quad Port Server Adapter
+		    Intel PRO/1000PF Server Adapter (SX Fiber)
+		    Intel PRO/1000PF Dual Port Server Adapter (SX Fiber)
 		Broadcom BCM570x (a.k.a. Tigon3) based PCI adapters (bge),
 		  including: [-]
 			3Com 3c996-T
@@ -351,6 +362,7 @@ Supported Peripherals:
 			Gigabyte 7N400 Pro2 Integrated Gigabit Ethernet (8110S)
 			LevelOne GNC-0105T (8169S)
 			Linksys EG1032v3 (8169S)
+			Netgear GA311 (8169S)
 			Netgear GA511 PC Card (8169)
 			PLANEX COMMUNICATIONS Inc. GN-1200TC (8169S)
 			Surecom EP-320G-TX1 (8169S)
@@ -461,7 +473,8 @@ work. It's our best guess that they do, but any feedback is appreciated.
 			SMC 2202USB/ETH
 			SMC 2206USB/ETH
 			SOHOware NUB100
-		ASIX Electronics AX88172 USB Ethernet adapters, including: [*]
+		ASIX Electronics AX88172/AX88178/AX88772 USB Ethernet adapters,
+		including: [*]
 			ATEN UC210T
 			BAFO BF-320
 			Billionton Systems USB2AR
@@ -471,9 +484,13 @@ work. It's our best guess that they do, but any feedback is appreciated.
 			Good Way GWUSB2E
 			Hawking UF200
 			Intellinet USB 2.0 to Ethernet (rev A)
+			IO-Data ETG-US2
 			JVC MP-PRX1
+			Level One USB-0200
 			Linksys USB200M
 			Netgear FA120
+			Nintendo Wii USB Lan Ethernet Adapter RVL-015
+			OQO model 01+ Ethernet
 			Sitecom LN-029
 			SMC 2209USB/ETH
 			SnapPort USB 2.0 LAN Adapter
@@ -487,6 +504,8 @@ work. It's our best guess that they do, but any feedback is appreciated.
 			Belkin F5U011/F5U111
 		Davicom DM9601 based USB adapters, including: [*]
 			Corega FEther USB-TXC
+			HenTong WK-668
+			ShanTou ST268
 		Kawasaki LSI KL5KUSB101B-based USB adapters (kue),
 		  including: [*]
 			3Com 3C19250
@@ -556,6 +575,33 @@ work. It's our best guess that they do, but any feedback is appreciated.
 		    Proxim Skyline 4032
 		    Senao NL-5354MP
 		    Wistron CM9
+		Atheros USB IEEE 802.11a/b/g adapters [-]
+		    Compex WLU108AG
+		    Compex WLU108G
+		    D-Link DWL-G132
+		    Netgear WG111T
+		    Netgear WG111U
+		    Netgear WPN111
+		    Olitec 000544
+		    PLANET WDL-U357
+		    Siemens Gigaset 108
+		    SMC SMCWUSBT-G
+		    SparkLAN WL-785A
+		    TP-Link TL-WN620G
+		    TRENDware International TEW-444UB
+		    TRENDware International TEW-504UB
+		    Unex Technology UR054ag
+		    ZyXEL XtremeMIMO M-202
+		Intersil/Conexant Prism GT PCI Full-MAC IEEE 802.11a/b/g [-]
+		    D-Link DWL-g650 A1
+		    I-O Data WN-G54/CB
+		    I4 Z-Com XG-600
+		    I4 Z-Com XG-900
+		    Intersil PRISM Indigo
+		    Intersil PRISM Duette
+		    PLANEX GW-DS54G
+		    SMC EZ Connect g 2.4GHz SMC2802W
+		    SMC 2802Wv2
 		Ralink RT2500 based PCI IEEE 802.11b/g adapters  [*]
 		    A-Link WL54H
 		    Amigo AWI-926W
@@ -633,6 +679,37 @@ work. It's our best guess that they do, but any feedback is appreciated.
 		    Zaapa ZNWUSB-54
 		    Zinwell ZWX-G261
 		    Zonet ZEW2500P
+		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
+		    3Com Aolynk WUB320g
+		    Abocom WUG2700
+		    Airlink101 AWLL5025
+		    Belkin F5D7050 ver 3
+		    Belkin F5D9050 ver 3
+		    Buffalo WLI-U2-SG54HP
+		    Buffalo WLI-U2-G54HP
+		    CNet CWD-854 ver F
+		    Conceptronic C54RU ver 2
+		    Corega CG-WLUSB2GO
+		    D-Link DWL-G122 rev C1
+		    D-Link WUA-1340
+		    Digitus DN-7003GR
+		    Edimax EW-7318USG
+		    Gigabyte GN-WB01GS
+		    Hawking HWUG1
+		    Hawking HWU54DM
+		    Hercules HWGUSB2-54-LB
+		    Hercules HWGUSB2-54V2-AP
+		    LevelOne WNC-0301USB v3
+		    Linksys WUSB54G rev C
+		    Linksys WUSB54GR
+		    Planex GW-US54HP
+		    Planex GW-US54Mini2
+		    Planex GW-USMM
+		    Senao NUB-3701
+		    Sitecom WL-113 ver 2
+		    Sitecom WL-172
+		    Sweex LW053
+		    TP-LINK TL-WN321G
 	ATM Adapters [*]
 		Efficient Networks EN-155 and Adaptec ANA-590x ATM interfaces
 		  (en)
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware
index 40cee2ab86b..c7591b45273 100644
--- a/distrib/notes/amd64/hardware
+++ b/distrib/notes/amd64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.78 2007/03/06 15:59:56 jasper Exp $
+dnl	$OpenBSD: hardware,v 1.79 2007/03/09 22:43:37 deraadt Exp $
 OpenBSD/MACHINE OSREV should work on all Athlon 64-based and
 compatible designs.
 
@@ -152,14 +152,55 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    USB Open Host Controller
 		PCI `universal' communication cards, providing serial
 		  and parallel ports, including:
+		    AT&T/Lucent Venus Modem (found on IBM 33L4618
+			card, Actiontec 56K, and others)
+		    Avlab Low Profile PCI 4S Quartet (4 port serial)
+		    Avlab PCI 2S (2 port serial)
+		    Boca Research Turbo Serial 654 PCI (4 port serial)
+		    Boca Research Turbo Serial 658 PCI (8 port serial)
+		    Decision Computer Inc PCCOM PCI 2 Port (serial)
+		    Decision Computer Inc PCCOM PCI 4 Port (serial)
+		    Decision Computer Inc PCCOM PCI 8 Port (serial)
+		    Digi International Digi Neo 4 (4 port serial)
 		    Dolphin Peripherals 4014 (dual parallel) and
 			4035 (dual serial)
+		    Exsys EX-41098 (4 port serial)
+		    Koutech IOFLEX-2S (dual serial
+		    Kouwell Model-223 (2-port serial, 1 port parallel)
+		    Lava Computers 2SP-PCI (parallel port)
+		    Lava Computers 2SP-PCI and Quattro-PCI (dual serial)
+		    Lava Computers Octopus-550
+		    Lava LavaPort-650
+		    Moxa Technologies Co., Ltd. PCI I/O Card 4S (4 port
+			serial)
+		    Moxa Technologies Co., Ltd. C104H/PCI (4 port serial)
+		    Moxa Technologies Co., Ltd. CP104/PCI (4 port serial)
+		    NEC PK-UG-X008 (serial)
+		    NEC PK-UG-X001 K56flex PCI (modem)
+		    NetMos 1P (1 port parallel)
+		    NetMos 2S1P (2 port serial and 1 port parallel)
+		    NetMos 4S (4 port serial)
+		    Oxford OX16PCI952 (2 port serial, 1 port parallel)
+		    Oxford OX16PCI954 (4 port serial, 1 port parallel)
 		    SIIG Cyber 2P1S (dual parallel, single serial)
 			and 2S1P (dual serial, single parallel)
 		    SIIG Cyber 4S (quad serial)
 		    SIIG Cyber I/O (single parallel, single serial)
 		    SIIG Cyber Parallel, Parallel Dual, Serial,
 			Serial Dual
+		    SIIG Cyber 8S PCI 16C850
+		    SUNIX 400x (1 port parallel)
+		    SUNIX 401x (2 port parallel)
+		    SUNIX 402x (1 port serial)
+		    SUNIX 403x (2 port serial)
+		    SUNIX 405x (4 port serial)
+		    SUNIX 406x (8 port serial)
+		    SUNIX 407x (2 port serial and 1 port parallel)
+		    SUNIX 408x (2 port serial and 2 port parallel)
+		    SUNIX 409x (4 port serial and 2 port parallel)
+		    Syba Tech Ltd. PCI-4S2P-550-ECP (4 port serial, 2
+			port parallel)
+		    US Robotics 3CP5609 PCI (modem)
 		    VScom PCI 800  (8 port serial)
 		    VScom PCI 011H (1 port parallel)
 		    VScom PCI 100H (1 port serial)
@@ -174,32 +215,6 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    VScom PCI 210L (2 port serial and 1 port parallel)
 		    VScom PCI 400L (4 port serial)
 		    VScom PCI 800L (8 port serial)
-		    AT&T/Lucent Venus Modem (found on IBM 33L4618
-			card, Actiontec 56K, and others)
-		    US Robotics 3CP5609 PCI (modem)
-		    Lava Computers 2SP-PCI (parallel port)
-		    Lava Computers 2SP-PCI and Quattro-PCI (dual
-			serial)
-		    NEC PK-UG-X008 (serial)
-		    NEC PK-UG-X001 K56flex PCI (modem)
-		    Koutech IOFLEX-2S (dual serial)
-		    Syba Tech Ltd. PCI-4S2P-550-ECP (4 port serial, 2
-			port parallel)
-		    Moxa Technologies Co., Ltd. PCI I/O Card 4S (4 port
-			serial)
-		    Moxa Technologies Co., Ltd. C104H/PCI (4 port serial)
-		    NetMos 2S1P (2 port serial and 1 port parallel)
-		    Boca Research Turbo Serial 654 PCI (4 port serial)
-		    Boca Research Turbo Serial 658 PCI (8 port serial)
-		    SUNIX 400x (1 port parallel)
-		    SUNIX 401x (2 port parallel)
-		    SUNIX 402x (1 port serial)
-		    SUNIX 403x (2 port serial)
-		    SUNIX 405x (4 port serial)
-		    SUNIX 406x (8 port serial)
-		    SUNIX 407x (2 port serial and 1 port parallel)
-		    SUNIX 408x (2 port serial and 2 port parallel)
-		    SUNIX 409x (4 port serial and 2 port parallel)
 	Ethernet Adapters
 		3Com 3c590 and 3c595
 		3Com 3c9xx Etherlink XL adapters, including:
@@ -248,7 +263,8 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    SMC 2202USB/ETH
 		    SMC 2206USB/ETH
 		    SOHOware NUB100
-		ASIX Electronics AX88172 USB Ethernet adapters, including:
+		ASIX Electronics AX88172/AX88178/AX88772 USB Ethernet adapters,
+		including:
 		    ATEN UC210T
 		    BAFO BF-320
 		    Billionton Systems USB2AR
@@ -258,9 +274,13 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    Good Way GWUSB2E
 		    Hawking UF200
 		    Intellinet USB 2.0 to Ethernet (rev A)
+		    IO-Data ETG-US2
 		    JVC MP-PRX1
+		    Level One USB-0200
 		    Linksys USB200M
 		    Netgear FA120
+		    Nintendo Wii USB Lan Ethernet Adapter RVL-015
+		    OQO model 01+ Ethernet
 		    Sitecom LN-029
 		    SMC 2209USB/ETH
 		    SnapPort USB 2.0 LAN Adapter
@@ -283,6 +303,8 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    Jaton XpressNet
 		Davicom DM9601 based USB adapters, including:
 		    Corega FEther USB-TXC
+		    HenTong WK-668
+		    ShanTou ST268
 		Digital DC21x4x-based PCI Ethernet adapters, including:
 		    Older SMC PCI EtherPower 10, 10/100 (models
 		      8432, 9332, and 9334)
@@ -429,6 +451,23 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    Proxim Skyline 4032
 		    Senao NL-5354MP
 		    Wistron CM9
+		Atheros USB IEEE 802.11a/b/g adapters
+		    Compex WLU108AG
+		    Compex WLU108G
+		    D-Link DWL-G132
+		    Netgear WG111T
+		    Netgear WG111U
+		    Netgear WPN111
+		    Olitec 000544
+		    PLANET WDL-U357
+		    Siemens Gigaset 108
+		    SMC SMCWUSBT-G
+		    SparkLAN WL-785A
+		    TP-Link TL-WN620G
+		    TRENDware International TEW-444UB
+		    TRENDware International TEW-504UB
+		    Unex Technology UR054ag
+		    ZyXEL XtremeMIMO M-202
 		Atmel AT76C50x based USB IEEE 802.11b adapters
 		    3Com 3CRSHEW696
 		    AboCom BWU613
@@ -523,6 +562,127 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    Z-Com XI-725/726
 		    Z-Com XI-735
 		    ZyXEL ZyAIR B-200
+		Intersil/Conexant Prism GT CardBus Full-MAC IEEE 802.11a/b/g
+		    3COM 3CRWE154G72
+		    NETGEAR WG511
+		    SMC EZ Connect g 2.4GHz SMC2835W-v2
+		    Soyo Aerielink
+		    Zyxel ZyAIR G-100 
+		Intersil/Conexant Prism GT PCI Full-MAC IEEE 802.11a/b/g
+		    D-Link DWL-g650 A1
+		    I-O Data WN-G54/CB
+		    I4 Z-Com XG-600
+		    I4 Z-Com XG-900
+		    Intersil PRISM Indigo
+		    Intersil PRISM Duette
+		    PLANEX GW-DS54G
+		    SMC EZ Connect g 2.4GHz SMC2802W
+		    SMC 2802Wv2
+		Marvell Libertas CardBus IEEE 802.11b/g wireless adapters
+		    Netgear WG511v2
+		Marvell Libertas PCI IEEE 802.11b/g wireless adapters
+		    Netgear WG311v3
+		Ralink RT2500 based CardBus IEEE 802.11b/g adapters
+		    A-Link WL54PC
+		    Alfa AWPC036
+		    Amigo AWI-914W
+		    AMIT WL531C
+		    ASUS WL-107G
+		    Atlantis Land A02-PCM-W54
+		    Belkin F5D7010 v2
+		    Canyon CN-WF513
+		    CC&C WL-2102
+		    CNet CWC-854
+		    Compex WL54
+		    Conceptronic C54RC
+		    Corega CG-WLCB54GL
+		    Digiconnect WL591C
+		    Digitus DN-7001G-RA
+		    Dynalink WLG25CARDBUS
+		    E-Tech WGPC02
+		    E-Tech WGPC03
+		    Edimax EW-7108PCg
+		    Eminent EM3036
+		    Encore ENPWI-G-RLAM
+		    Eusso UGL2454-01R
+		    Fibreline WL-400X
+		    Gigabyte GN-WMKG
+		    Hawking HWC54GR
+		    Hercules HWGPCMCIA-54
+		    JAHT WN-4054P
+		    KCORP LifeStyle KLS-611
+		    LevelOne WPC-0301 v2
+		    Micronet SP908GK V3
+		    Minitar MN54GCB-R
+		    MSI CB54G2
+		    MSI MS-6835
+		    Pro-Nets CB80211G
+		    Repotec RP-WB7108
+		    SATech SN-54C
+		    Sitecom WL-112
+		    SparkLAN WL-685R
+		    Surecom EP-9428-g
+		    Sweex LC500050
+		    TekComm NE-9428-g
+		    Tonze PW-6200C
+		    Unex MR054g-R02
+		    Zinwell ZWX-G160
+		    Zonet ZEW1500
+		Ralink RT2500 based Mini PCI IEEE 802.11b/g adapters
+		    Amigo AWI-922W
+		    Billionton MIWLGRL
+		    Gigabyte GN-WIKG
+		    MSI MP54G2
+		    MSI MS-6833
+		    Tonze PC-620C
+		    Zinwell ZWX-G360
+		Ralink RT2500 based PCI IEEE 802.11b/g adapters
+		    A-Link WL54H
+		    Amigo AWI-926W
+		    AMIT WL531P
+		    AOpen AOI-831
+		    ASUS WL-130g
+		    ASUS WIFI-G-AAY
+		    Atlantis Land A02-PCI-W54
+		    Belkin F5D7000 v3
+		    Canyon CN-WF511
+		    CNet CWP-854
+		    Compex WLP54G
+		    Conceptronic C54Ri
+		    Corega CG-WLPCI54GL
+		    Digitus DN-7006G-RA
+		    Dynalink WLG25PCI
+		    E-Tech WGPI02
+		    Edimax EW-7128g
+		    Eminent EM3037
+		    Encore ENLWI-G-RLAM
+		    Eusso UGL2454-VPR
+		    Fiberline WL-400P
+		    Foxconn WLL-3350
+		    Gigabyte GN-WPKG
+		    Hawking HWP54GR
+		    Hercules HWGPCI-54
+		    iNexQ CR054g-009 (R03)
+		    JAHT WN-4054PCI
+		    LevelOne WNC-0301 v2
+		    Linksys WMP54G v4
+		    Micronet SP906GK
+		    Minitar MN54GPC-R
+		    MSI MS-6834
+		    MSI PC54G2
+		    OvisLink EVO-W54PCI
+		    PheeNet HWL-PCIG/RA
+		    Pro-Nets PC80211G
+		    Repotec RP-WP0854
+		    SATech SN-54P
+		    Sitecom WL-115
+		    Surecom EP-9321-g1
+		    Sweex LC700030
+		    TekComm NE-9321-g
+		    Tonze PC-6200C
+		    Unex CR054g-R02
+		    Zinwell ZWX-G361
+		    Zonet ZEW1600
 		Ralink RT2500 based USB 2.0 IEEE 802.11b/g adapters
 		    AMIT WL532U
 		    ASUS WL-167g
@@ -553,6 +713,97 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    Zaapa ZNWUSB-54
 		    Zinwell ZWX-G261
 		    Zonet ZEW2500P
+		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
+		    3Com Aolynk WUB320g
+		    Abocom WUG2700
+		    Airlink101 AWLL5025
+		    Belkin F5D7050 ver 3
+		    Belkin F5D9050 ver 3
+		    Buffalo WLI-U2-SG54HP
+		    Buffalo WLI-U2-G54HP
+		    CNet CWD-854 ver F
+		    Conceptronic C54RU ver 2
+		    Corega CG-WLUSB2GO
+		    D-Link DWL-G122 rev C1
+		    D-Link WUA-1340
+		    Digitus DN-7003GR
+		    Edimax EW-7318USG
+		    Gigabyte GN-WB01GS
+		    Hawking HWUG1
+		    Hawking HWU54DM
+		    Hercules HWGUSB2-54-LB
+		    Hercules HWGUSB2-54V2-AP
+		    LevelOne WNC-0301USB v3
+		    Linksys WUSB54G rev C
+		    Linksys WUSB54GR
+		    Planex GW-US54HP
+		    Planex GW-US54Mini2
+		    Planex GW-USMM
+		    Senao NUB-3701
+		    Sitecom WL-113 ver 2
+		    Sitecom WL-172
+		    Sweex LW053
+		    TP-LINK TL-WN321G
+		Texas Instruments ACX100/ACX111 CardBus IEEE 802.11a/b/g
+		adapters
+		    D-Link DWL-650+
+		    D-Link DWL-G630+
+		    D-Link DWL-G650+
+		    Ergenic ERG WL-003
+		    Hamlet HNWP254
+		    Linksys WPC54Gv2
+		    Microcom Travelcard
+		    Sceptre SC254W+
+		    USR USR5410
+		    Zyxel G-160
+		Texas Instruments ACX100/ACX111 PCI IEEE 802.11a/b/g adapters
+		    D-Link DWL-520+
+		    D-Link DWL-G520+
+		    Hawking HWP54G
+		    Netgear WG311v2
+		    Tornado/ADT 211g
+		    USR USR5416
+		    Zyxel G-360 EE
+		ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g adapters
+		    3COM 3CRUSB10075
+		    Acer WLAN-G-US1
+		    Airlink+ AWLL3025
+		    Airlink 101 AWLL3026
+		    AOpen 802.11g WL54
+		    Asus A9T integrated wirless
+		    Asus WL-159g
+		    Belkin F5D7050 v.4000
+		    Billion BiPAC 3011G
+		    Buffalo WLI-U2-KG54L
+		    CC&C WL-2203B
+		    DrayTek Vigor 550
+		    Edimax EW-7317UG
+		    Fiberline Networks WL-43OU
+		    iNexQ UR055g
+		    Linksys WUSBF54G
+		    Longshine LCS-8131G3
+		    MSI US54SE
+		    Philips SNU5600
+		    Planet WL-U356
+		    Planex GW-US54GZL
+		    Planex GW-US54Mini
+		    Safecom SWMULZ-5400
+		    Sagem XG 760A
+		    Sagem XG 76NA
+		    Sandberg Wireless G54 USB
+		    Sitecom  WL-113
+		    SMC SMCWUSB-G
+		    Sweex wireless USB 54 Mbps
+		    Tekram/Siemens USB adapter
+		    Telegent TG54USB
+		    Trendnet TEW-424UB
+		    Trendnet TEW-429UB
+		    TwinMOS G240
+		    US Robotics 5423
+		    X-Micro XWL-11GUZX
+		    Yakumo QuickWLAN USB
+		    Zonet ZEW2501
+		    Zyxel ZyAIR G-220
 	Gigabit Ethernet Adapters
 		Alteon Tigon I/II PCI Gigabit Ethernet boards, including:
 		    3Com 3c985 and 3c985B
@@ -569,8 +820,8 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    HP ProLiant NC6136 PCI Gigabit NIC (SX Fiber)
 		    HP ProLiant NC6170 PCI-X Gigabit NIC (SX Fiber)
 		    HP ProLiant NC7131 PCI Gigabit NIC
-		    HP ProLiant NC7170 PCI-X Gigabit NIC
-		    HP ProLiant NC7170LP PCI-X Gigabit NIC
+		    HP ProLiant NC7170 PCI-X Dual Port Gigabit NIC
+		    HP ProLiant NC7170LP PCI-X Dual Port Gigabit NIC
 		    Intel PRO/1000 Gigabit Server Adapter (SX Fiber)
 		      (PWLA8490)
 		    Intel PRO/1000F Gigabit Server Adapter (SX Fiber)
@@ -615,6 +866,7 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    Gigabyte 7N400 Pro2 Integrated Gigabit Ethernet (8110S)
 		    LevelOne GNC-0105T (8169S)
 		    Linksys EG1032v3 (8169S)
+		    Netgear GA311 (8169S)
 		    Netgear GA511 PC Card (8169)
 		    PLANEX COMMUNICATIONS Inc. GN-1200TC (8169S)
 		    Surecom EP-320G-TX1 (8169S)
@@ -811,6 +1063,7 @@ dnl		    See above
 		    I/O DATA GV-BCTV3/PCI
 		    KISS TV/FM PCI
 		    Leadtek Winfast TV 2000
+		    Leadtek Winfast TV 2000 XP
 		    Miro PC TV
 		    MMAC Osprey
 		    NEC PK-UG-X017
diff --git a/distrib/notes/armish/hardware b/distrib/notes/armish/hardware
index 2f84ab64fe3..16b7fb5afa3 100644
--- a/distrib/notes/armish/hardware
+++ b/distrib/notes/armish/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.3 2007/02/15 13:57:53 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.4 2007/03/09 22:43:37 deraadt Exp $
 dnl When more than one model is supported, turn this into a list...
 OpenBSD/MACHINE runs on the Thecus N2100 and IOData HDL-G models at the moment.
 
@@ -50,6 +50,8 @@ Supported devices {:-include-:}:
 		    Belkin F5U011/F5U111
 		Davicom DM9601 based USB adapters, including:
 		    Corega FEther USB-TXC
+		    HenTong WK-668
+		    ShanTou ST268
 		Kawasaki LSI KL5KUSB101B-based USB adapters, including:
 		    3Com 3c19250
 		    3Com 3c460 HomeConnect
@@ -202,6 +204,38 @@ Supported devices {:-include-:}:
 		    Zaapa ZNWUSB-54
 		    Zinwell ZWX-G261
 		    Zonet ZEW2500P
+		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
+		    3Com Aolynk WUB320g
+		    Abocom WUG2700
+		    Airlink101 AWLL5025
+		    Belkin F5D7050 ver 3
+		    Belkin F5D9050 ver 3
+		    Buffalo WLI-U2-SG54HP
+		    Buffalo WLI-U2-G54HP
+		    CNet CWD-854 ver F
+		    Conceptronic C54RU ver 2
+		    Corega CG-WLUSB2GO
+		    D-Link DWL-G122 rev C1
+		    D-Link WUA-1340
+		    Digitus DN-7003GR
+		    Edimax EW-7318USG
+		    Gigabyte GN-WB01GS
+		    Hawking HWUG1
+		    Hawking HWU54DM
+		    Hercules HWGUSB2-54-LB
+		    Hercules HWGUSB2-54V2-AP
+		    LevelOne WNC-0301USB v3
+		    Linksys WUSB54G rev C
+		    Linksys WUSB54GR
+		    Planex GW-US54HP
+		    Planex GW-US54Mini2
+		    Planex GW-USMM
+		    Senao NUB-3701
+		    Sitecom WL-113 ver 2
+		    Sitecom WL-172
+		    Sweex LW053
+		    TP-LINK TL-WN321G
+
 	Serial ports
 		On-board serial (com) ports
 	Universal Serial Bus (USB) Devices
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 86c97e85674..095fc74f2ee 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.245 2007/03/06 15:59:56 jasper Exp $
+dnl	$OpenBSD: hardware,v 1.246 2007/03/09 22:43:37 deraadt Exp $
 OpenBSD/MACHINE OSREV works across a broad range of standard PCs and
 clones, with a wide variety of processors and I/O bus architectures.  It
 can be expected to install and run with minimal difficulties on most
@@ -245,14 +245,55 @@ Supported hardware {:-include-:}:
 		    USB Open Host Controller [A] [B] [C]
 		PCI `universal' communication cards, providing serial
 		  and parallel ports, including: [G]
+		    AT&T/Lucent Venus Modem (found on IBM 33L4618
+			card, Actiontec 56K, and others)
+		    Avlab Low Profile PCI 4S Quartet (4 port serial)
+		    Avlab PCI 2S (2 port serial)
+		    Boca Research Turbo Serial 654 PCI (4 port serial)
+		    Boca Research Turbo Serial 658 PCI (8 port serial)
+		    Decision Computer Inc PCCOM PCI 2 Port (serial)
+		    Decision Computer Inc PCCOM PCI 4 Port (serial)
+		    Decision Computer Inc PCCOM PCI 8 Port (serial)
+		    Digi International Digi Neo 4 (4 port serial)
 		    Dolphin Peripherals 4014 (dual parallel) and
 			4035 (dual serial)
+		    Exsys EX-41098 (4 port serial)
+		    Koutech IOFLEX-2S (dual serial
+		    Kouwell Model-223 (2-port serial, 1 port parallel)
+		    Lava Computers 2SP-PCI (parallel port)
+		    Lava Computers 2SP-PCI and Quattro-PCI (dual serial)
+		    Lava Computers Octopus-550
+		    Lava LavaPort-650
+		    Moxa Technologies Co., Ltd. PCI I/O Card 4S (4 port
+			serial)
+		    Moxa Technologies Co., Ltd. C104H/PCI (4 port serial)
+		    Moxa Technologies Co., Ltd. CP104/PCI (4 port serial)
+		    NEC PK-UG-X008 (serial)
+		    NEC PK-UG-X001 K56flex PCI (modem)
+		    NetMos 1P (1 port parallel)
+		    NetMos 2S1P (2 port serial and 1 port parallel)
+		    NetMos 4S (4 port serial)
+		    Oxford OX16PCI952 (2 port serial, 1 port parallel)
+		    Oxford OX16PCI954 (4 port serial, 1 port parallel)
 		    SIIG Cyber 2P1S (dual parallel, single serial)
 			and 2S1P (dual serial, single parallel)
 		    SIIG Cyber 4S (quad serial)
 		    SIIG Cyber I/O (single parallel, single serial)
 		    SIIG Cyber Parallel, Parallel Dual, Serial,
 			Serial Dual
+		    SIIG Cyber 8S PCI 16C850
+		    SUNIX 400x (1 port parallel)
+		    SUNIX 401x (2 port parallel)
+		    SUNIX 402x (1 port serial)
+		    SUNIX 403x (2 port serial)
+		    SUNIX 405x (4 port serial)
+		    SUNIX 406x (8 port serial)
+		    SUNIX 407x (2 port serial and 1 port parallel)
+		    SUNIX 408x (2 port serial and 2 port parallel)
+		    SUNIX 409x (4 port serial and 2 port parallel)
+		    Syba Tech Ltd. PCI-4S2P-550-ECP (4 port serial, 2
+			port parallel)
+		    US Robotics 3CP5609 PCI (modem)
 		    VScom PCI 800  (8 port serial)
 		    VScom PCI 011H (1 port parallel)
 		    VScom PCI 100H (1 port serial)
@@ -267,32 +308,6 @@ Supported hardware {:-include-:}:
 		    VScom PCI 210L (2 port serial and 1 port parallel)
 		    VScom PCI 400L (4 port serial)
 		    VScom PCI 800L (8 port serial)
-		    AT&T/Lucent Venus Modem (found on IBM 33L4618
-			card, Actiontec 56K, and others)
-		    US Robotics 3CP5609 PCI (modem)
-		    Lava Computers 2SP-PCI (parallel port)
-		    Lava Computers 2SP-PCI and Quattro-PCI (dual
-			serial)
-		    NEC PK-UG-X008 (serial)
-		    NEC PK-UG-X001 K56flex PCI (modem)
-		    Koutech IOFLEX-2S (dual serial)
-		    Syba Tech Ltd. PCI-4S2P-550-ECP (4 port serial, 2
-			port parallel)
-		    Moxa Technologies Co., Ltd. PCI I/O Card 4S (4 port
-			serial)
-		    Moxa Technologies Co., Ltd. C104H/PCI (4 port serial)
-		    NetMos 2S1P (2 port serial and 1 port parallel)
-		    Boca Research Turbo Serial 654 PCI (4 port serial)
-		    Boca Research Turbo Serial 658 PCI (8 port serial)
-		    SUNIX 400x (1 port parallel)
-		    SUNIX 401x (2 port parallel)
-		    SUNIX 402x (1 port serial)
-		    SUNIX 403x (2 port serial)
-		    SUNIX 405x (4 port serial)
-		    SUNIX 406x (8 port serial)
-		    SUNIX 407x (2 port serial and 1 port parallel)
-		    SUNIX 408x (2 port serial and 2 port parallel)
-		    SUNIX 409x (4 port serial and 2 port parallel)
 	Ethernet Adapters
 		3Com 3c501 [A] [B] [C]
 		3Com 3c503 [B] [C]
@@ -341,12 +356,12 @@ Supported hardware {:-include-:}:
 		    AEI USB Fast Ethernet
 		    Allied Telesyn AT-USB100
 		    ATEN UC-110T
-		    Belkin USB to LAN
+		    Belkin F5D5050
 		    Billionton Systems USB100, USB100E, USB100LP, USBE100
 		    Corega FEther USB-TX, USB-TXS
 		    D-Link DSB-650, 650TX, 650TX-PNA
 		    ELCON Systemtechnik Goldpfeil P-LAN
-		    Elecom LD-USB/TX, LD-USBL/TX
+		    Elecom LD-USB/TX, LD-USBL/TX, LD-USB20
 		    Elsa Microlink USB2Ethernet
 		    GIGABYTE GN-BR402W
 		    Hawking UF100
@@ -376,9 +391,13 @@ Supported hardware {:-include-:}:
 		    Good Way GWUSB2E
 		    Hawking UF200
 		    Intellinet USB 2.0 to Ethernet (rev A)
+		    IO-Data ETG-US2
 		    JVC MP-PRX1
+		    Level One USB-0200
 		    Linksys USB200M
 		    Netgear FA120
+		    Nintendo Wii USB Lan Ethernet Adapter RVL-015
+		    OQO model 01+ Ethernet
 		    Sitecom LN-029
 		    SMC 2209USB/ETH
 		    SnapPort USB 2.0 LAN Adapter
@@ -387,7 +406,6 @@ Supported hardware {:-include-:}:
 		    System TALKS SGC-X2UL
 		    TRENDnet TU2-ET100
 		    Z-TEK ZK-R01-2
-
 		AMD LANCE and PCnet-based ISA Ethernet adapters, including: [B] [C]
 		    Novell NE1500T
 		    Novell NE2100
@@ -408,6 +426,8 @@ Supported hardware {:-include-:}:
 		    Jaton XpressNet
 		Davicom DM9601 based USB adapters, including: [A] [B] [C]
 		    Corega FEther USB-TXC
+		    HenTong WK-668
+		    ShanTou ST268
 		DEC EtherWORKS III adapters, including: [G]
 		    DEC DE203, DE204, DE205
 		Digital DC21x4x-based PCI Ethernet adapters, including:
@@ -543,6 +563,11 @@ Supported hardware {:-include-:}:
 		    Addtron AEF-360TX
 		    Hawking PN102TX
 		    D-Link DFE530TX
+		VMware VMXnet Virtual Interface Controller devices: [A] [B] [C]
+		    VMware ESX Server 2.x
+		    VMware GSX Server 2.5 and newer
+		    VMware Server 1.0 and newer
+		    VMware Workstation 4.5 and newer
 		Winbond W89C840F Ethernet adapters, including: [A] [B] [C]
 		    TRENDnet TE100-PCIE
 		    Compex RL100-ATX 10/100baseTX
@@ -579,6 +604,23 @@ Supported hardware {:-include-:}:
 		    Proxim Skyline 4032
 		    Senao NL-5354MP
 		    Wistron CM9
+		Atheros USB IEEE 802.11a/b/g adapters [*]
+		    Compex WLU108AG
+		    Compex WLU108G
+		    D-Link DWL-G132
+		    Netgear WG111T
+		    Netgear WG111U
+		    Netgear WPN111
+		    Olitec 000544
+		    PLANET WDL-U357
+		    Siemens Gigaset 108
+		    SMC SMCWUSBT-G
+		    SparkLAN WL-785A
+		    TP-Link TL-WN620G
+		    TRENDware International TEW-444UB
+		    TRENDware International TEW-504UB
+		    Unex Technology UR054ag
+		    ZyXEL XtremeMIMO M-202
 		Atmel AT76C50x based USB IEEE 802.11b adapters [G]
 		    3Com 3CRSHEW696
 		    AboCom BWU613
@@ -740,6 +782,26 @@ Supported hardware {:-include-:}:
 		    Z-Com XI-725/726
 		    Z-Com XI-735
 		    ZyXEL ZyAIR B-200
+		Intersil/Conexant Prism GT CardBus Full-MAC IEEE 802.11a/b/g [*]
+		    3COM 3CRWE154G72
+		    NETGEAR WG511
+		    SMC EZ Connect g 2.4GHz SMC2835W-v2
+		    Soyo Aerielink
+		    Zyxel ZyAIR G-100 
+		Intersil/Conexant Prism GT PCI Full-MAC IEEE 802.11a/b/g [*]
+		    D-Link DWL-g650 A1
+		    I-O Data WN-G54/CB
+		    I4 Z-Com XG-600
+		    I4 Z-Com XG-900
+		    Intersil PRISM Indigo
+		    Intersil PRISM Duette
+		    PLANEX GW-DS54G
+		    SMC EZ Connect g 2.4GHz SMC2802W
+		    SMC 2802Wv2
+		Marvell Libertas CardBus IEEE 802.11b/g wireless adapters [*]
+		    Netgear WG511v2
+		Marvell Libertas PCI IEEE 802.11b/g wireless adapters [*]
+		    Netgear WG311v3
 		Ralink RT2500 based CardBus IEEE 802.11b/g adapters [A] [B]
 		    A-Link WL54PC
 		    Alfa AWPC036
@@ -751,8 +813,10 @@ Supported hardware {:-include-:}:
 		    Canyon CN-WF513
 		    CC&C WL-2102
 		    CNet CWC-854
+		    Compex WL54
 		    Conceptronic C54RC
 		    Corega CG-WLCB54GL
+		    Digiconnect WL591C
 		    Digitus DN-7001G-RA
 		    Dynalink WLG25CARDBUS
 		    E-Tech WGPC02
@@ -832,7 +896,7 @@ Supported hardware {:-include-:}:
 		    Repotec RP-WP0854
 		    SATech SN-54P
 		    Sitecom WL-115
-		    Surecom EP-9321-g
+		    Surecom EP-9321-g1
 		    Sweex LC700030
 		    TekComm NE-9321-g
 		    Tonze PC-6200C
@@ -841,7 +905,7 @@ Supported hardware {:-include-:}:
 		    Zonet ZEW1600
 		Ralink RT2500 based USB 2.0 IEEE 802.11b/g adapters [A] [B]
 		    AMIT WL532U
-		    ASUS WL-167g
+		    ASUS WL-167g v1
 		    Belkin F5D7050 v2000
 		    Buffalo WLI-U2-KG54
 		    Buffalo WLI-U2-KG54-AI
@@ -873,19 +937,78 @@ Supported hardware {:-include-:}:
 		    Zaapa ZNWUSB-54
 		    Zinwell ZWX-G261
 		    Zonet ZEW2500P
-		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters [G]
+		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g
+		adapters [G]
+		    3Com Aolynk WUB320g
+		    Abocom WUG2700
 		    Airlink101 AWLL5025
 		    Belkin F5D7050 ver 3
 		    Belkin F5D9050 ver 3
+		    Buffalo WLI-U2-SG54HP
+		    Buffalo WLI-U2-G54HP
 		    CNet CWD-854 ver F
 		    Conceptronic C54RU ver 2
+		    Corega CG-WLUSB2GO
 		    D-Link DWL-G122 rev C1
 		    D-Link WUA-1340
+		    Digitus DN-7003GR
+		    Edimax EW-7318USG
 		    Gigabyte GN-WB01GS
+		    Hawking HWUG1
+		    Hawking HWU54DM
+		    Hercules HWGUSB2-54-LB
+		    Hercules HWGUSB2-54V2-AP
+		    LevelOne WNC-0301USB v3
 		    Linksys WUSB54G rev C
+		    Linksys WUSB54GR
+		    Planex GW-US54HP
+		    Planex GW-US54Mini2
 		    Planex GW-USMM
+		    Senao NUB-3701
 		    Sitecom WL-113 ver 2
 		    Sitecom WL-172
+		    Sweex LW053
+		    TP-LINK TL-WN321G
+		ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g adapters [A] [B] [C]
+		    3COM 3CRUSB10075
+		    Acer WLAN-G-US1
+		    Airlink+ AWLL3025
+		    Airlink 101 AWLL3026
+		    AOpen 802.11g WL54
+		    Asus A9T integrated wirless
+		    Asus WL-159g
+		    Belkin F5D7050 v.4000
+		    Billion BiPAC 3011G
+		    Buffalo WLI-U2-KG54L
+		    CC&C WL-2203B
+		    DrayTek Vigor 550
+		    Edimax EW-7317UG
+		    Fiberline Networks WL-43OU
+		    iNexQ UR055g
+		    Linksys WUSBF54G
+		    Longshine LCS-8131G3
+		    MSI US54SE
+		    Philips SNU5600
+		    Planet WL-U356
+		    Planex GW-US54GZL
+		    Planex GW-US54Mini
+		    Safecom SWMULZ-5400
+		    Sagem XG 760A
+		    Sagem XG 76NA
+		    Sandberg Wireless G54 USB
+		    Sitecom  WL-113
+		    SMC SMCWUSB-G
+		    Sweex wireless USB 54 Mbps
+		    Tekram/Siemens USB adapter
+		    Telegent TG54USB
+		    Trendnet TEW-424UB
+		    Trendnet TEW-429UB
+		    TwinMOS G240
+		    US Robotics 5423
+		    X-Micro XWL-11GUZX
+		    Yakumo QuickWLAN USB
+		    Zonet ZEW2501
+		    Zyxel ZyAIR G-220
 		Raytheon Raylink PCMCIA IEEE 802.11 FH adapters [A] [B] [C]
 		Realtek RTL8180L based CardBus IEEE 802.11b adapters [A] [B]
 		    Belkin F5D6020 V3
@@ -904,7 +1027,7 @@ Supported hardware {:-include-:}:
 		    D-Link DWL-650+
 		    D-Link DWL-G630+
 		    D-Link DWL-G650+
-		    Engenic ERG WL-003
+		    Ergenic ERG WL-003
 		    Hamlet HNWP254
 		    Linksys WPC54Gv2
 		    Microcom Travelcard
@@ -934,6 +1057,7 @@ Supported hardware {:-include-:}:
 		i82547, i82571, i82572 and i82573 based adapters, including:
 		    HP ProLiant NC310F PCI-X Gigabit NIC (SX Fiber)
 		    HP ProLiant NC340T PCI-X Gigabit NIC
+		    HP ProLiant NC360T PCI Express Dual Port Gigabit NIC
 		    HP ProLiant NC6132 Upgrade Module (SX Fiber)
 		    HP ProLiant NC6133 Upgrade Module (LX Fiber)
 		    HP ProLiant NC6134 PCI Gigabit NIC (SX Fiber)
@@ -941,8 +1065,8 @@ Supported hardware {:-include-:}:
 		    HP ProLiant NC6170 PCI-X Gigabit NIC (SX Fiber)
 		    HP ProLiant NC7131 PCI Gigabit NIC
 		    HP ProLiant NC7132 Upgrade Module
-		    HP ProLiant NC7170 PCI-X Gigabit NIC
-		    HP ProLiant NC7170LP PCI-X Gigabit NIC
+		    HP ProLiant NC7170 PCI-X Dual Port Gigabit NIC
+		    HP ProLiant NC7170LP PCI-X Dual Port Gigabit NIC
 		    Intel PRO/1000 Gigabit Server Adapter (SX Fiber)
 		      (PWLA8490)
 		    Intel PRO/1000F Gigabit Server Adapter (SX Fiber)
@@ -960,6 +1084,13 @@ Supported hardware {:-include-:}:
 		      (PWLA8492MF)
 		    Intel PRO/1000MF Server Adapter (LX Fiber) (PWLA8490LX)
 		    Intel PRO/1000MT Quad PCI-X Adapter (PWLA8494MT)
+		    Intel PRO/1000GT Quad PCI-X Adapter (PWLA8494GT)
+		    Intel PRO/1000PT Desktop Adapter
+		    Intel PRO/1000PT Server Adapter
+		    Intel PRO/1000PT Dual Port Server Adapter
+		    Intel PRO/1000PT Quad Port Server Adapter
+		    Intel PRO/1000PF Server Adapter (SX Fiber)
+		    Intel PRO/1000PF Dual Port Server Adapter (SX Fiber)
 		National Semiconductor DP83280 and DP83281 based PCI
 		adapters, including: [A] [B] [C]
 		    Addtron AEG320T
@@ -994,6 +1125,7 @@ Supported hardware {:-include-:}:
 		    HP NC370F PCI-X
 		    HP NC370T PCI-X
 		    HP NC373F PCI Express 
+		    HP NC373i PCI Express
 		    HP NC380T PCI Express Dual Port
 		    IBM xSeries 3550 integrated BCM5708
 		    IBM xSeries 3650 integrated BCM5708
@@ -1004,6 +1136,7 @@ Supported hardware {:-include-:}:
 		    Gigabyte 7N400 Pro2 Integrated Gigabit Ethernet (8110S)
 		    LevelOne GNC-0105T (8169S)
 		    Linksys EG1032v3 (8169S)
+		    Netgear GA311 (8169S)
 		    Netgear GA511 PC Card (8169)
 		    PLANEX COMMUNICATIONS Inc. GN-1200TC (8169S)
 		    Surecom EP-320G-TX1 (8169S)
@@ -1221,6 +1354,7 @@ Supported hardware {:-include-:}:
 		    I/O DATA GV-BCTV3/PCI
 		    KISS TV/FM PCI
 		    Leadtek Winfast TV 2000
+		    Leadtek Winfast TV 2000 XP
 		    Miro PC TV
 		    MMAC Osprey
 		    NEC PK-UG-X017
diff --git a/distrib/notes/landisk/hardware b/distrib/notes/landisk/hardware
index 27d7d9af21e..ef213c19b4f 100644
--- a/distrib/notes/landisk/hardware
+++ b/distrib/notes/landisk/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.4 2007/02/28 22:30:05 miod Exp $
+dnl	$OpenBSD: hardware,v 1.5 2007/03/09 22:43:37 deraadt Exp $
 OpenBSD/MACHINE runs on the following SH4-based IO-DATA made models:
 	IO-DATA USL-5P, using CF storage (Japan)
 	IO-DATA HDL-U, HDL-AV, HDL-W and HDLM-U series (Japan)
@@ -28,7 +28,8 @@ Supported devices {:-include-:}:
 		    SMC 2202USB/ETH
 		    SMC 2206USB/ETH
 		    SOHOware NUB100
-		ASIX Electronics AX88172 USB Ethernet adapters, including:
+		ASIX Electronics AX88172/AX88178/AX88772 USB Ethernet adapters,
+		including:
 		    ATEN UC210T
 		    BAFO BF-320
 		    Billionton Systems USB2AR
@@ -38,9 +39,13 @@ Supported devices {:-include-:}:
 		    Good Way GWUSB2E
 		    Hawking UF200
 		    Intellinet USB 2.0 to Ethernet (rev A)
+		    IO-Data ETG-US2
 		    JVC MP-PRX1
+		    Level One USB-0200
 		    Linksys USB200M
 		    Netgear FA120
+		    Nintendo Wii USB Lan Ethernet Adapter RVL-015
+		    OQO model 01+ Ethernet
 		    Sitecom LN-029
 		    SMC 2209USB/ETH
 		    SnapPort USB 2.0 LAN Adapter
@@ -54,6 +59,8 @@ Supported devices {:-include-:}:
 		    Belkin F5U011/F5U111
 		Davicom DM9601 based USB adapters, including:
 		    Corega FEther USB-TXC
+		    HenTong WK-668
+		    ShanTou ST268
 		Kawasaki LSI KL5KUSB101B-based USB adapters, including:
 		    3Com 3c19250
 		    3Com 3c460 HomeConnect
@@ -99,6 +106,23 @@ Supported devices {:-include-:}:
 		    Zt USB10/100
 		    Z-TEK ZK-R02
 	Wireless Ethernet Adapters
+		Atheros USB IEEE 802.11a/b/g adapters
+		    Compex WLU108AG
+		    Compex WLU108G
+		    D-Link DWL-G132
+		    Netgear WG111T
+		    Netgear WG111U
+		    Netgear WPN111
+		    Olitec 000544
+		    PLANET WDL-U357
+		    Siemens Gigaset 108
+		    SMC SMCWUSBT-G
+		    SparkLAN WL-785A
+		    TP-Link TL-WN620G
+		    TRENDware International TEW-444UB
+		    TRENDware International TEW-504UB
+		    Unex Technology UR054ag
+		    ZyXEL XtremeMIMO M-202
 		Atmel AT76C50x based USB IEEE 802.11b adapters
 		    3Com 3CRSHEW696
 		    AboCom BWU613
@@ -206,6 +230,77 @@ Supported devices {:-include-:}:
 		    Zaapa ZNWUSB-54
 		    Zinwell ZWX-G261
 		    Zonet ZEW2500P
+		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
+		    3Com Aolynk WUB320g
+		    Abocom WUG2700
+		    Airlink101 AWLL5025
+		    Belkin F5D7050 ver 3
+		    Belkin F5D9050 ver 3
+		    Buffalo WLI-U2-SG54HP
+		    Buffalo WLI-U2-G54HP
+		    CNet CWD-854 ver F
+		    Conceptronic C54RU ver 2
+		    Corega CG-WLUSB2GO
+		    D-Link DWL-G122 rev C1
+		    D-Link WUA-1340
+		    Digitus DN-7003GR
+		    Edimax EW-7318USG
+		    Gigabyte GN-WB01GS
+		    Hawking HWUG1
+		    Hawking HWU54DM
+		    Hercules HWGUSB2-54-LB
+		    Hercules HWGUSB2-54V2-AP
+		    LevelOne WNC-0301USB v3
+		    Linksys WUSB54G rev C
+		    Linksys WUSB54GR
+		    Planex GW-US54HP
+		    Planex GW-US54Mini2
+		    Planex GW-USMM
+		    Senao NUB-3701
+		    Sitecom WL-113 ver 2
+		    Sitecom WL-172
+		    Sweex LW053
+		    TP-LINK TL-WN321G
+		ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g adapters
+		    3COM 3CRUSB10075
+		    Acer WLAN-G-US1
+		    Airlink+ AWLL3025
+		    Airlink 101 AWLL3026
+		    AOpen 802.11g WL54
+		    Asus A9T integrated wirless
+		    Asus WL-159g
+		    Belkin F5D7050 v.4000
+		    Billion BiPAC 3011G
+		    Buffalo WLI-U2-KG54L
+		    CC&C WL-2203B
+		    DrayTek Vigor 550
+		    Edimax EW-7317UG
+		    Fiberline Networks WL-43OU
+		    iNexQ UR055g
+		    Linksys WUSBF54G
+		    Longshine LCS-8131G3
+		    MSI US54SE
+		    Philips SNU5600
+		    Planet WL-U356
+		    Planex GW-US54GZL
+		    Planex GW-US54Mini
+		    Safecom SWMULZ-5400
+		    Sagem XG 760A
+		    Sagem XG 76NA
+		    Sandberg Wireless G54 USB
+		    Sitecom  WL-113
+		    SMC SMCWUSB-G
+		    Sweex wireless USB 54 Mbps
+		    Tekram/Siemens USB adapter
+		    Telegent TG54USB
+		    Trendnet TEW-424UB
+		    Trendnet TEW-429UB
+		    TwinMOS G240
+		    US Robotics 5423
+		    X-Micro XWL-11GUZX
+		    Yakumo QuickWLAN USB
+		    Zonet ZEW2501
+		    Zyxel ZyAIR G-220
 	Serial ports
 		On-board serial (scif) port
 	Universal Serial Bus (USB) Devices
diff --git a/distrib/notes/macppc/hardware b/distrib/notes/macppc/hardware
index ead6f7a3a2b..d48457ac9dc 100644
--- a/distrib/notes/macppc/hardware
+++ b/distrib/notes/macppc/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.78 2007/02/15 13:57:53 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.79 2007/03/09 22:43:37 deraadt Exp $
 OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, and G4 Cube, as well
 as PowerBook and iBook machines.
 
@@ -137,7 +137,8 @@ Supported devices {:-include-:}:
 			Farallon PN9000SX
 			Netgear GA620 and GA620T
 			SGI Tigon
-		ASIX Electronics AX88172 USB Ethernet adapters (axe), including:
+		ASIX Electronics AX88172/AX88178/AX88772 USB Ethernet adapters (axe),
+		including:
 			ATEN UC210T
 			BAFO BF-320
 			Billionton Systems USB2AR
@@ -147,9 +148,13 @@ Supported devices {:-include-:}:
 			Good Way GWUSB2E
 			Hawking UF200
 			Intellinet USB 2.0 to Ethernet (rev A)
+			IO-Data ETG-US2
 			JVC MP-PRX1
+			Level One USB-0200
 			Linksys USB200M
 			Netgear FA120
+			Nintendo Wii USB Lan Ethernet Adapter RVL-015
+			OQO model 01+ Ethernet
 			Sitecom LN-029
 			SMC 2209USB/ETH
 			SnapPort USB 2.0 LAN Adapter
@@ -172,6 +177,8 @@ Supported devices {:-include-:}:
 			SmartBridges SmartLink
 		Davicom DM9601 USB Ethernet adapters (udav), including:
 			Corega FEther USB-TXC 
+			HenTong WK-668
+			ShanTou ST268
 		Digital DC21x4x-based PCI Ethernet adapters (de), including:
 			Znyx ZX34X
 		Digital DC21x43 clone-based PCI Ethernet adapters (dc)
@@ -188,31 +195,42 @@ Supported devices {:-include-:}:
 
 		Intel i82540, i82541, i82542, i82543, i82544, i82545, i82546,
 		i82547, i82571, i82572 and i82573 based adapters (em), including:
-			HP ProLiant NC310F PCI-X Gigabit NIC (SX Fiber)
-			HP ProLiant NC340T PCI-X Gigabit NIC
-			HP ProLiant NC6134 PCI Gigabit NIC (SX Fiber)
-			HP ProLiant NC6136 PCI Gigabit NIC (SX Fiber)
-			HP ProLiant NC6170 PCI-X Gigabit NIC (SX Fiber)
-			HP ProLiant NC7131 PCI Gigabit NIC
-			HP ProLiant NC7170 PCI-X Gigabit NIC
-			HP ProLiant NC7170LP PCI-X Gigabit NIC
-			Intel PRO/1000 Gigabit Server Adapter (SX Fiber)
-			(PWLA8490)
-			Intel PRO/1000F Gigabit Server Adapter (SX Fiber)
-			(PWLA8490SX)
-			Intel PRO/1000T Server Adapter (PWLA8490T)
-			Intel PRO/1000XT Server Adapter (PWLA8490XT)
-			Intel PRO/1000XS Server Adapter (SX Fiber) (PWLA8490XF)
-			Intel PRO/1000T Desktop Adapter (PWLA8390T)
-			Intel PRO/1000XTL Lo Profile PCI Server (PWLA8490XTL)
-			Intel PRO/1000MT Desktop Adapter (PWLA8390MT)
-			Intel PRO/1000MT Server Adapter (PWLA8490MT)
-			Intel PRO/1000MT Dual Port Server Adapter (PWLA8492MT)
-			Intel PRO/1000MF Server Adapter (SX Fiber) (PWLA8490MF)
-			Intel PRO/1000MF Dual Port Server Adapter (SX Fiber)
-			(PWLA8492MF)
-			Intel PRO/1000MF Server Adapter (LX Fiber) (PWLA8490LX)
-			Intel PRO/1000MT Quad PCI-X Adapter (PWLA8494MT)
+		    HP ProLiant NC310F PCI-X Gigabit NIC (SX Fiber)
+		    HP ProLiant NC340T PCI-X Gigabit NIC
+		    HP ProLiant NC360T PCI Express Dual Port Gigabit NIC
+		    HP ProLiant NC6132 Upgrade Module (SX Fiber)
+		    HP ProLiant NC6133 Upgrade Module (LX Fiber)
+		    HP ProLiant NC6134 PCI Gigabit NIC (SX Fiber)
+		    HP ProLiant NC6136 PCI Gigabit NIC (SX Fiber)
+		    HP ProLiant NC6170 PCI-X Gigabit NIC (SX Fiber)
+		    HP ProLiant NC7131 PCI Gigabit NIC
+		    HP ProLiant NC7132 Upgrade Module
+		    HP ProLiant NC7170 PCI-X Dual Port Gigabit NIC
+		    HP ProLiant NC7170LP PCI-X Dual Port Gigabit NIC
+		    Intel PRO/1000 Gigabit Server Adapter (SX Fiber)
+		      (PWLA8490)
+		    Intel PRO/1000F Gigabit Server Adapter (SX Fiber)
+		      (PWLA8490SX)
+		    Intel PRO/1000T Server Adapter (PWLA8490T)
+		    Intel PRO/1000XT Server Adapter (PWLA8490XT)
+		    Intel PRO/1000XS Server Adapter (SX Fiber) (PWLA8490XF)
+		    Intel PRO/1000T Desktop Adapter (PWLA8390T)
+		    Intel PRO/1000XTL Lo Profile PCI Server (PWLA8490XTL)
+		    Intel PRO/1000MT Desktop Adapter (PWLA8390MT)
+		    Intel PRO/1000MT Server Adapter (PWLA8490MT)
+		    Intel PRO/1000MT Dual Port Server Adapter (PWLA8492MT)
+		    Intel PRO/1000MF Server Adapter (SX Fiber) (PWLA8490MF)
+		    Intel PRO/1000MF Dual Port Server Adapter (SX Fiber)
+		      (PWLA8492MF)
+		    Intel PRO/1000MF Server Adapter (LX Fiber) (PWLA8490LX)
+		    Intel PRO/1000MT Quad PCI-X Adapter (PWLA8494MT)
+		    Intel PRO/1000GT Quad PCI-X Adapter (PWLA8494GT)
+		    Intel PRO/1000PT Desktop Adapter
+		    Intel PRO/1000PT Server Adapter
+		    Intel PRO/1000PT Dual Port Server Adapter
+		    Intel PRO/1000PT Quad Port Server Adapter
+		    Intel PRO/1000PF Server Adapter (SX Fiber)
+		    Intel PRO/1000PF Dual Port Server Adapter (SX Fiber)
 		Kawasaki LSI KL5KUSB101B-based USB adapters (kue), including:
 			3Com 3c19250
 			3Com 3c460 HomeConnect
@@ -280,6 +298,7 @@ Supported devices {:-include-:}:
 			Gigabyte 7N400 Pro2 Integrated Gigabit Ethernet (8110S) 
 			LevelOne GNC-0105T (8169S)
 			Linksys EG1032v3 (8169S)
+			Netgear GA311 (8169S)
 			Netgear GA511 PC Card (8169)
 			PLANEX COMMUNICATIONS Inc. GN-1200TC (8169S)
 			Surecom EP-320G-TX1 (8169S)
@@ -295,127 +314,162 @@ Supported devices {:-include-:}:
 
 	Wireless Ethernet Adapters
 		PCMCIA Adapters
-			Aironet IEEE 802.11FH/b PCMCIA and PCI (an)
-			WaveLAN IEEE 802.11b PCMCIA (wi)
+		    Aironet IEEE 802.11FH/b PCMCIA and PCI (an)
+		    WaveLAN IEEE 802.11b PCMCIA (wi)
 		Atmel AT76C50x based USB IEEE 802.11b adapters
-			3Com 3CRSHEW696
-			AboCom BWU613
-			Accton 2664W
-			Acer Peripherals AWL300
-			Acer Peripherals AWL400
-			Actiontec 802UAT1
-			Addtron AWU120
-			Aincomm AWU2000B
-			Askey Computer Voyager 1010
-			Askey Computer WLL013 (Intersil Radio)
-			Askey Computer WLL013 (RFMD Radio)
-			Belkin F5D6050
-			Bluetake BW002
-			Compaq iPAQ h54xx/h55xx Internal WLAN
-			Conceptronic C11U
-			Conceptronic WL210
-			Corega WLAN USB Stick 11
-			Dick Smith Electronics CHUSB 611G
-			Dick Smith Electronics WL200U
-			Dick Smith Electronics WL240U
-			Dick Smith Electronics XH1153
-			D-Link DWL-120 rev E
-			Geowave GW-US11S
-			Gigabyte GN-WLBM101
-			Gigaset WLAN
-			Hewlett-Packard HN210W
-			Intel AP310 AnyPoint II
-			I/O DATA USB WN-B11
-			Lexar 2662W-AR
-			Linksys WUSB11
-			Linksys WUSB11 v2.8
-			MSI WLAN
-			Netgear MA101
-			Netgear MA101 rev B
-			Ovislink AirLive WL-1120USB
-			OvisLink AirLive WL-1130USB
-			Planex Communications GW-US11S
-			Samsung SWL2100W
-			Siemens WLL013
-			SMC 2662W-AR
-			SMC 2662W-V4
-			Tekram U-300C
-			Z-Com M4Y-750
+		    3Com 3CRSHEW696
+		    AboCom BWU613
+		    Accton 2664W
+		    Acer Peripherals AWL300
+		    Acer Peripherals AWL400
+		    Actiontec 802UAT1
+		    Addtron AWU120
+		    Aincomm AWU2000B
+		    Askey Computer Voyager 1010
+		    Askey Computer WLL013 (Intersil Radio)
+		    Askey Computer WLL013 (RFMD Radio)
+		    Belkin F5D6050
+		    Bluetake BW002
+		    Compaq iPAQ h54xx/h55xx Internal WLAN
+		    Conceptronic C11U
+		    Conceptronic WL210
+		    Corega WLAN USB Stick 11
+		    Dick Smith Electronics CHUSB 611G
+		    Dick Smith Electronics WL200U
+		    Dick Smith Electronics WL240U
+		    Dick Smith Electronics XH1153
+		    D-Link DWL-120 rev E
+		    Geowave GW-US11S
+		    Gigabyte GN-WLBM101
+		    Gigaset WLAN
+		    Hewlett-Packard HN210W
+		    Intel AP310 AnyPoint II
+		    I/O DATA USB WN-B11
+		    Lexar 2662W-AR
+		    Linksys WUSB11
+		    Linksys WUSB11 v2.8
+		    MSI WLAN
+		    Netgear MA101
+		    Netgear MA101 rev B
+		    Ovislink AirLive WL-1120USB
+		    OvisLink AirLive WL-1130USB
+		    Planex Communications GW-US11S
+		    Samsung SWL2100W
+		    Siemens WLL013
+		    SMC 2662W-AR
+		    SMC 2662W-V4
+		    Tekram U-300C
+		    Z-Com M4Y-750
 		Intersil PRISM 2.5/3 based USB IEEE 802.11b adapters
-			Acer Warplink USB-400
-			Actiontec HWU01170
-			AirVast WM168b
-			Ambit WLAN
-			Apacer Wireless Steno MB112
-			ASUS WL-140
-			Compaq W100
-			Corega WLUSB-11
-			Corega WLUSB-11 Key
-			D-Link DWL-120 (rev F)
-			D-Link DWL-122
-			I-O DATA WN-B11/USB
-			Intel PRO/Wireless 2011B
-			Intersil Prism 2X
-			JVC MP-XP7250
-			Linksys WUSB11 v3.0
-			Linksys WUSB12
-			Melco WLI-USB-KB11
-			Melco WLI-USB-KS11G
-			Melco WLI-USB-S11
-			Microsoft MN510
-			Netgear MA111 (version 1)
-			Pheenet WL-503IA
-			Planex GW-US11H
-			Siemens SpeedStream SS1022
-			Sitecom WL-022
-			Syntax USB-400
-			US Robotics 1120
-			ViewSonic Airsync
-			Z-Com XI-725/726
-			Z-Com XI-735
-			ZyXEL ZyAIR B-200
+		    Acer Warplink USB-400
+		    Actiontec HWU01170
+		    AirVast WM168b
+		    Ambit WLAN
+		    Apacer Wireless Steno MB112
+		    ASUS WL-140
+		    Compaq W100
+		    Corega WLUSB-11
+		    Corega WLUSB-11 Key
+		    D-Link DWL-120 (rev F)
+		    D-Link DWL-122
+		    I-O DATA WN-B11/USB
+		    Intel PRO/Wireless 2011B
+		    Intersil Prism 2X
+		    JVC MP-XP7250
+		    Linksys WUSB11 v3.0
+		    Linksys WUSB12
+		    Melco WLI-USB-KB11
+	 	    Melco WLI-USB-KS11G
+		    Melco WLI-USB-S11
+		    Microsoft MN510
+		    Netgear MA111 (version 1)
+		    Pheenet WL-503IA
+		    Planex GW-US11H
+		    Siemens SpeedStream SS1022
+		    Sitecom WL-022
+		    Syntax USB-400
+		    US Robotics 1120
+		    ViewSonic Airsync
+		    Z-Com XI-725/726
+		    Z-Com XI-735
+		    ZyXEL ZyAIR B-200
+		Marvell Libertas CardBus IEEE 802.11b/g wireless adapters [*]
+		    Netgear WG511v2
+		Marvell Libertas PCI IEEE 802.11b/g wireless adapters [*]
+		    Netgear WG311v3
 		Ralink RT2500 based USB 2.0 IEEE 802.11b/g adapters
-			AMIT WL532U
-			ASUS WL-167g
-			Belkin F5D7050
-			Buffalo WLI-U2-KG54
-			Buffalo WLI-U2-KG54-AI
-			Buffalo WLI-U2-KG54-YB
-			CNet CWD-854
-			Compex WLU54G
-			Conceptronic C54RU
-			D-Link DWL-G122 (b1)
-			Dynalink WLG25USB
-			E-Tech WGUS02
-			Eminent 3035
-			Gigabyte GN-WBKG
-			Hercules HWGUSB2-54
-			KCORP LifeStyle KLS-685
-			Linksys WUSB54G v4
-			Linksys WUSB54GP v4
-			MSI MS-6861
-			MSI MS-6865
-			MSI MS-6869
-			SerComm UB801R
-			SparkLAN WL-685R
-			Sphairon UB801R
-			Surecom EP-9001-g rev 3A
-			Tonze UW-6200C
-			Zaapa ZNWUSB-54
-			Zinwell ZWX-G261
-			Zonet ZEW2500P
+		    AMIT WL532U
+		    ASUS WL-167g v1
+		    Belkin F5D7050
+		    Buffalo WLI-U2-KG54
+		    Buffalo WLI-U2-KG54-AI
+		    Buffalo WLI-U2-KG54-YB
+		    CNet CWD-854
+		    Compex WLU54G
+		    Conceptronic C54RU
+		    D-Link DWL-G122 (b1)
+		    Dynalink WLG25USB
+		    E-Tech WGUS02
+		    Eminent 3035
+		    Gigabyte GN-WBKG
+		    Hercules HWGUSB2-54
+		    KCORP LifeStyle KLS-685
+		    Linksys WUSB54G v4
+		    Linksys WUSB54GP v4
+		    MSI MS-6861
+		    MSI MS-6865
+		    MSI MS-6869
+		    SerComm UB801R
+		    SparkLAN WL-685R
+		    Sphairon UB801R
+		    Surecom EP-9001-g rev 3A
+		    Tonze UW-6200C
+		    Zaapa ZNWUSB-54
+		    Zinwell ZWX-G261
+		    Zonet ZEW2500P
+		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
+		    3Com Aolynk WUB320g
+		    Abocom WUG2700
+		    Airlink101 AWLL5025
+		    Belkin F5D7050 ver 3
+		    Belkin F5D9050 ver 3
+		    Buffalo WLI-U2-SG54HP
+		    Buffalo WLI-U2-G54HP
+		    CNet CWD-854 ver F
+		    Conceptronic C54RU ver 2
+		    Corega CG-WLUSB2GO
+		    D-Link DWL-G122 rev C1
+		    D-Link WUA-1340
+		    Digitus DN-7003GR
+		    Edimax EW-7318USG
+		    Gigabyte GN-WB01GS
+		    Hawking HWUG1
+		    Hawking HWU54DM
+		    Hercules HWGUSB2-54-LB
+		    Hercules HWGUSB2-54V2-AP
+		    LevelOne WNC-0301USB v3
+		    Linksys WUSB54G rev C
+		    Linksys WUSB54GR
+		    Planex GW-US54HP
+		    Planex GW-US54Mini2
+		    Planex GW-USMM
+		    Senao NUB-3701
+		    Sitecom WL-113 ver 2
+		    Sitecom WL-172
+		    Sweex LW053
+		    TP-LINK TL-WN321G
 		Realtek RTL8180L based CardBus IEEE 802.11b adapters
-			Belkin F5D6020 V3
-			Buffalo WLI-CB-B11
-			Corega CG-WLCB11V3
-			D-Link DWL-610
-			Level-One WPC-0101
-			Linksys WPC11 v4
-			Netgear MA521
-			Ovislink AirLive WL-1120PCM
-			Planet WL-3553
-			TRENDnet TEW-226PC
-			VCTnet PC-11B1
+		    Belkin F5D6020 V3
+		    Buffalo WLI-CB-B11
+		    Corega CG-WLCB11V3
+		    D-Link DWL-610
+		    Level-One WPC-0101
+		    Linksys WPC11 v4
+		    Netgear MA521
+		    Ovislink AirLive WL-1120PCM
+		    Planet WL-3553
+		    TRENDnet TEW-226PC
+		    VCTnet PC-11B1
 
 	Tape drives
 		SCSI Tape drives (st)
@@ -465,6 +519,7 @@ Supported devices {:-include-:}:
 			I/O DATA GV-BCTV3/PCI
 			KISS TV/FM PCI
 			Leadtek Winfast TV 2000
+			Leadtek Winfast TV 2000 XP
 			Miro PC TV
 			MMAC Osprey
 			NEC PK-UG-X017
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index 6f1ef9e3610..8937277306a 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.121 2007/02/28 22:22:19 kettenis Exp $
+dnl	$OpenBSD: hardware,v 1.122 2007/03/09 22:43:37 deraadt Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	Ultra 1/1E 
 	Ultra 2 
@@ -118,12 +118,16 @@ Supported devices {:-include-:}:
 		i82547, i82571, i82572 and i82573 based adapters, including:
 		    HP ProLiant NC310F PCI-X Gigabit NIC (SX Fiber)
 		    HP ProLiant NC340T PCI-X Gigabit NIC
+		    HP ProLiant NC360T PCI Express Dual Port Gigabit NIC
+		    HP ProLiant NC6132 Upgrade Module (SX Fiber)
+		    HP ProLiant NC6133 Upgrade Module (LX Fiber)
 		    HP ProLiant NC6134 PCI Gigabit NIC (SX Fiber)
 		    HP ProLiant NC6136 PCI Gigabit NIC (SX Fiber)
 		    HP ProLiant NC6170 PCI-X Gigabit NIC (SX Fiber)
 		    HP ProLiant NC7131 PCI Gigabit NIC
-		    HP ProLiant NC7170 PCI-X Gigabit NIC
-		    HP ProLiant NC7170LP PCI-X Gigabit NIC
+		    HP ProLiant NC7132 Upgrade Module
+		    HP ProLiant NC7170 PCI-X Dual Port Gigabit NIC
+		    HP ProLiant NC7170LP PCI-X Dual Port Gigabit NIC
 		    Intel PRO/1000 Gigabit Server Adapter (SX Fiber)
 		      (PWLA8490)
 		    Intel PRO/1000F Gigabit Server Adapter (SX Fiber)
@@ -132,7 +136,7 @@ Supported devices {:-include-:}:
 		    Intel PRO/1000XT Server Adapter (PWLA8490XT)
 		    Intel PRO/1000XS Server Adapter (SX Fiber) (PWLA8490XF)
 		    Intel PRO/1000T Desktop Adapter (PWLA8390T)
-		    Intel PRO/1000XTL Low Profile PCI Server (PWLA8490XTL)
+		    Intel PRO/1000XTL Lo Profile PCI Server (PWLA8490XTL)
 		    Intel PRO/1000MT Desktop Adapter (PWLA8390MT)
 		    Intel PRO/1000MT Server Adapter (PWLA8490MT)
 		    Intel PRO/1000MT Dual Port Server Adapter (PWLA8492MT)
@@ -141,6 +145,13 @@ Supported devices {:-include-:}:
 		      (PWLA8492MF)
 		    Intel PRO/1000MF Server Adapter (LX Fiber) (PWLA8490LX)
 		    Intel PRO/1000MT Quad PCI-X Adapter (PWLA8494MT)
+		    Intel PRO/1000GT Quad PCI-X Adapter (PWLA8494GT)
+		    Intel PRO/1000PT Desktop Adapter
+		    Intel PRO/1000PT Server Adapter
+		    Intel PRO/1000PT Dual Port Server Adapter
+		    Intel PRO/1000PT Quad Port Server Adapter
+		    Intel PRO/1000PF Server Adapter (SX Fiber)
+		    Intel PRO/1000PF Dual Port Server Adapter (SX Fiber)
 		Broadcom BCM570x (Tigon3) based PCI adapters 
 		    3Com 3c996-T (10/100/1000baseT) 
 		    3Com 3c996-SX (1000baseSX) 
@@ -182,6 +193,7 @@ Supported devices {:-include-:}:
                     Gigabyte 7N400 Pro2 Integrated Gigabit Ethernet (8110S)
                     LevelOne GNC-0105T (8169S)
                     Linksys EG1032v3 (8169S)
+		    Netgear GA311 (8169S)
                     Netgear GA511 PC Card (8169)
                     PLANEX COMMUNICATIONS Inc. GN-1200TC (8169S)
                     Surecom EP-320G-TX1 (8169S)
@@ -216,7 +228,8 @@ Supported devices {:-include-:}:
 		    SMC 2202USB/ETH
 		    SMC 2206USB/ETH
 		    SOHOware NUB100, NUB110
-		ASIX Electronics AX88172 USB Ethernet adapters, including:
+		ASIX Electronics AX88172/AX88178/AX88772 USB Ethernet adapters,
+		including:
 		    ATEN UC210T
 		    BAFO BF-320
 		    Billionton Systems USB2AR
@@ -226,9 +239,13 @@ Supported devices {:-include-:}:
 		    Good Way GWUSB2E
 		    Hawking UF200
 		    Intellinet USB 2.0 to Ethernet (rev A)
+		    IO-Data ETG-US2
 		    JVC MP-PRX1
+		    Level One USB-0200
 		    Linksys USB200M
 		    Netgear FA120
+		    Nintendo Wii USB Lan Ethernet Adapter RVL-015
+		    OQO model 01+ Ethernet
 		    Sitecom LN-029
 		    SMC 2209USB/ETH
 		    SnapPort USB 2.0 LAN Adapter
@@ -243,6 +260,8 @@ Supported devices {:-include-:}:
 		    SmartBridges SmartLink 
 		Davicom DM9601 based USB adapters, including:
 		    Corega FEther USB-TXC
+		    HenTong WK-668
+		    ShanTou ST268
 		Kawasaki LSI KL5KUSB101B-based USB adapters, including:
 		    3Com 3c19250
 		    3Com 3c460 HomeConnect
@@ -488,74 +507,77 @@ Supported devices {:-include-:}:
 		    Z-Com XI-725/726
 		    Z-Com XI-735
 		    ZyXEL ZyAIR B-200
-		Ralink Technology IEEE 802.11a/b/g USB adapters
-		    AMIT WL532U 
-		    ASUS WL-167g 
-		    Belkin F5D7050 
-		    Buffalo WLI-U2-KG54 
-		    Buffalo WLI-U2-KG54-AI 
-		    Buffalo WLI-U2-KG54-YB 
-		    CNet CWD-854 
-		    Compex WLU54G 
-		    Conceptronic C54RU 
-		    D-Link DWL-G122 (b1) 
-		    Dynalink WLG25USB 
-		    E-Tech WGUS02 
-		    Eminent 3035 
-		    Gigabyte GN-WBKG 
-		    Hercules HWGUSB2-54 
-		    KCORP LifeStyle KLS-685 
-		    Linksys WUSB54G v4 
-		    Linksys WUSB54GP v4 
-		    MSI MS-6861 
-		    MSI MS-6865 
-		    MSI MS-6869 
-		    Nintendo Wi-Fi USB Connector 
-		    Nova Tech NV-902W 
-		    OvisLink Evo-W54USB 
-		    SerComm UB801R 
-		    SparkLAN WL-685R 
-		    Sphairon UB801R 
-		    Surecom EP-9001-g rev 3A 
-		    Sweex LC100060 
-		    Tonze UW-6200C 
-		    Zaapa ZNWUSB-54 
-		    Zinwell ZPlus-G250 
-		    Zinwell ZWX-G261 
-		    Zonet ZEW2500 
-		Ralink Technology USB IEEE 802.11a/b/g USB adapters
-		    3Com Aolynk WUB320g 
-		    Abocom WUG2700 
-		    Airlink101 AWLL5025 
-		    ASUS WL-167g ver 2 
-		    Belkin F5D7050 ver 3 
-		    Belkin F5D9050 ver 3 
-		    Buffalo WLI-U2-SG54HP 
-		    Buffalo WLI-U2-G54HP 
-		    CNet CWD-854 ver F 
-		    Conceptronic C54RU ver 2 
-		    Corega CG-WLUSB2GO 
-		    D-Link DWL-G122 rev C1 
-		    D-Link WUA-1340 
-		    Digitus DN-7003GR 
-		    Edimax EW-7318USG 
-		    Gigabyte GN-WB01GS 
-		    Gigabyte GN-WI05GS 
-		    Hawking HWUG1 
-		    Hawking HWU54DM 
-		    Hercules HWGUSB2-54-LB 
-		    Hercules HWGUSB2-54V2-AP 
-		    LevelOne WNC-0301USB v3 
-		    Linksys WUSB54G rev C 
-		    Linksys WUSB54GR 
-		    Planex GW-US54HP 
-		    Planex GW-US54Mini2 
-		    Planex GW-USMM 
-		    Senao NUB-3701 
-		    Sitecom WL-113 ver 2 
-		    Sitecom WL-172 
-		    Sweex LW053 
-		    TP-LINK TL-WN321G 
+		Intersil/Conexant Prism GT PCI Full-MAC IEEE 802.11a/b/g
+		    D-Link DWL-g650 A1
+		    I-O Data WN-G54/CB
+		    I4 Z-Com XG-600
+		    I4 Z-Com XG-900
+		    Intersil PRISM Indigo
+		    Intersil PRISM Duette
+		    PLANEX GW-DS54G
+		    SMC EZ Connect g 2.4GHz SMC2802W
+		    SMC 2802Wv2
+		Ralink RT2500 based USB 2.0 IEEE 802.11b/g adapters
+		    AMIT WL532U
+		    ASUS WL-167g
+		    Belkin F5D7050
+		    Buffalo WLI-U2-KG54
+		    Buffalo WLI-U2-KG54-AI
+		    Buffalo WLI-U2-KG54-YB
+		    CNet CWD-854
+		    Compex WLU54G
+		    Conceptronic C54RU
+		    D-Link DWL-G122 (b1)
+		    Dynalink WLG25USB
+		    E-Tech WGUS02
+		    Eminent 3035
+		    Gigabyte GN-WBKG
+		    Hercules HWGUSB2-54
+		    KCORP LifeStyle KLS-685
+		    Linksys WUSB54G v4
+		    Linksys WUSB54GP v4
+		    MSI MS-6861
+		    MSI MS-6865
+		    MSI MS-6869
+		    SerComm UB801R
+		    SparkLAN WL-685R
+		    Sphairon UB801R
+		    Surecom EP-9001-g rev 3A
+		    Tonze UW-6200C
+		    Zaapa ZNWUSB-54
+		    Zinwell ZWX-G261
+		    Zonet ZEW2500P
+		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
+		    3Com Aolynk WUB320g
+		    Abocom WUG2700
+		    Airlink101 AWLL5025
+		    Belkin F5D7050 ver 3
+		    Belkin F5D9050 ver 3
+		    Buffalo WLI-U2-SG54HP
+		    Buffalo WLI-U2-G54HP
+		    CNet CWD-854 ver F
+		    Conceptronic C54RU ver 2
+		    Corega CG-WLUSB2GO
+		    D-Link DWL-G122 rev C1
+		    D-Link WUA-1340
+		    Digitus DN-7003GR
+		    Edimax EW-7318USG
+		    Gigabyte GN-WB01GS
+		    Hawking HWUG1
+		    Hawking HWU54DM
+		    Hercules HWGUSB2-54-LB
+		    Hercules HWGUSB2-54V2-AP
+		    LevelOne WNC-0301USB v3
+		    Linksys WUSB54G rev C
+		    Linksys WUSB54GR
+		    Planex GW-US54HP
+		    Planex GW-US54Mini2
+		    Planex GW-USMM
+		    Senao NUB-3701
+		    Sitecom WL-113 ver 2
+		    Sitecom WL-172
+		    Sweex LW053
+		    TP-LINK TL-WN321G
 		TI ACX100/ACX111 IEEE 802.11a/b/g PCI adapters
 		    D-Link DWL-520+ 
 		    D-Link DWL-G520+ 
@@ -595,13 +617,57 @@ Supported devices {:-include-:}:
 		Aurora SBus sio2 Serial Interface (asio)
 		PCI `universal' communication cards, providing serial
 		  and parallel ports, including:
-		    Dolphin Peripherals 4035 (dual serial)
+		    AT&T/Lucent Venus Modem (found on IBM 33L4618
+			card, Actiontec 56K, and others)
+		    Avlab Low Profile PCI 4S Quartet (4 port serial)
+		    Avlab PCI 2S (2 port serial)
+		    Boca Research Turbo Serial 654 PCI (4 port serial)
+		    Boca Research Turbo Serial 658 PCI (8 port serial)
+		    Decision Computer Inc PCCOM PCI 2 Port (serial)
+		    Decision Computer Inc PCCOM PCI 4 Port (serial)
+		    Decision Computer Inc PCCOM PCI 8 Port (serial)
+		    Digi International Digi Neo 4 (4 port serial)
+		    Dolphin Peripherals 4014 (dual parallel) and
+			4035 (dual serial)
+		    Exsys EX-41098 (4 port serial)
+		    Koutech IOFLEX-2S (dual serial
+		    Kouwell Model-223 (2-port serial, 1 port parallel)
+		    Lava Computers 2SP-PCI (parallel port)
+		    Lava Computers 2SP-PCI and Quattro-PCI (dual serial)
+		    Lava Computers Octopus-550
+		    Lava LavaPort-650
+		    Moxa Technologies Co., Ltd. PCI I/O Card 4S (4 port
+			serial)
+		    Moxa Technologies Co., Ltd. C104H/PCI (4 port serial)
+		    Moxa Technologies Co., Ltd. CP104/PCI (4 port serial)
+		    NEC PK-UG-X008 (serial)
+		    NEC PK-UG-X001 K56flex PCI (modem)
+		    NetMos 1P (1 port parallel)
+		    NetMos 2S1P (2 port serial and 1 port parallel)
+		    NetMos 4S (4 port serial)
+		    Oxford OX16PCI952 (2 port serial, 1 port parallel)
+		    Oxford OX16PCI954 (4 port serial, 1 port parallel)
 		    SIIG Cyber 2P1S (dual parallel, single serial)
 			and 2S1P (dual serial, single parallel)
 		    SIIG Cyber 4S (quad serial)
 		    SIIG Cyber I/O (single parallel, single serial)
-		    SIIG Cyber Serial, Serial Dual
+		    SIIG Cyber Parallel, Parallel Dual, Serial,
+			Serial Dual
+		    SIIG Cyber 8S PCI 16C850
+		    SUNIX 400x (1 port parallel)
+		    SUNIX 401x (2 port parallel)
+		    SUNIX 402x (1 port serial)
+		    SUNIX 403x (2 port serial)
+		    SUNIX 405x (4 port serial)
+		    SUNIX 406x (8 port serial)
+		    SUNIX 407x (2 port serial and 1 port parallel)
+		    SUNIX 408x (2 port serial and 2 port parallel)
+		    SUNIX 409x (4 port serial and 2 port parallel)
+		    Syba Tech Ltd. PCI-4S2P-550-ECP (4 port serial, 2
+			port parallel)
+		    US Robotics 3CP5609 PCI (modem)
 		    VScom PCI 800  (8 port serial)
+		    VScom PCI 011H (1 port parallel)
 		    VScom PCI 100H (1 port serial)
 		    VScom PCI 110H (1 port serial and 1 port parallel)
 		    VScom PCI 200H (2 port serial)
@@ -614,29 +680,6 @@ Supported devices {:-include-:}:
 		    VScom PCI 210L (2 port serial and 1 port parallel)
 		    VScom PCI 400L (4 port serial)
 		    VScom PCI 800L (8 port serial)
-		    AT&T/Lucent Venus Modem (found on IBM 33L4618
-			card, Actiontec 56K, and others)
-		    US Robotics 3CP5609 PCI (modem)
-		    Lava Computers 2SP-PCI and Quattro-PCI (dual
-			serial)
-		    NEC PK-UG-X008 (serial)
-		    NEC PK-UG-X001 K56flex PCI (modem)
-		    Koutech IOFLEX-2S (dual serial)
-		    Syba Tech Ltd. PCI-4S2P-550-ECP (4 port serial, 2
-			port parallel)
-		    Moxa Technologies Co., Ltd. PCI I/O Card 4S (4 port
-			serial)
-		    Moxa Technologies Co., Ltd. C104H/PCI (4 port serial)
-		    NetMos 2S1P (2 port serial and 1 port parallel)
-		    Boca Research Turbo Serial 654 PCI (4 port serial)
-		    Boca Research Turbo Serial 658 PCI (8 port serial)
-		    SUNIX 402x (1 port serial)
-		    SUNIX 403x (2 port serial)
-		    SUNIX 405x (4 port serial)
-		    SUNIX 406x (8 port serial)
-		    SUNIX 407x (2 port serial and 1 port parallel)
-		    SUNIX 408x (2 port serial and 2 port parallel)
-		    SUNIX 409x (4 port serial and 2 port parallel)
 
 	Sound devices:
 		onboard SBus CS4321 (audiocs)
diff --git a/distrib/notes/zaurus/hardware b/distrib/notes/zaurus/hardware
index d0f320fd61d..54bd7a93a88 100644
--- a/distrib/notes/zaurus/hardware
+++ b/distrib/notes/zaurus/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.22 2007/02/15 13:57:53 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.23 2007/03/09 22:43:37 deraadt Exp $
 dnl When more than one model is supported, turn this into a list...
 OpenBSD/MACHINE runs on the Sharp Zaurus SL-C3000, SL-C3100 and
 SL-C3200 models at the moment.
@@ -25,7 +25,8 @@ Supported devices {:-include-:}:
 		    SMC 2202USB/ETH
 		    SMC 2206USB/ETH
 		    SOHOware NUB100
-		ASIX Electronics AX88172 USB Ethernet adapters, including:
+		ASIX Electronics AX88172/AX88178/AX88772 USB Ethernet adapters,
+		including:
 		    ATEN UC210T
 		    BAFO BF-320
 		    Billionton Systems USB2AR
@@ -35,9 +36,13 @@ Supported devices {:-include-:}:
 		    Good Way GWUSB2E
 		    Hawking UF200
 		    Intellinet USB 2.0 to Ethernet (rev A)
+		    IO-Data ETG-US2
 		    JVC MP-PRX1
+		    Level One USB-0200
 		    Linksys USB200M
 		    Netgear FA120
+		    Nintendo Wii USB Lan Ethernet Adapter RVL-015
+		    OQO model 01+ Ethernet
 		    Sitecom LN-029
 		    SMC 2209USB/ETH
 		    SnapPort USB 2.0 LAN Adapter
@@ -51,6 +56,8 @@ Supported devices {:-include-:}:
 		    Belkin F5U011/F5U111
 		Davicom DM9601 based USB adapters, including:
 		    Corega FEther USB-TXC
+		    HenTong WK-668
+		    ShanTou ST268
 		Kawasaki LSI KL5KUSB101B-based USB adapters, including:
 		    3Com 3c19250
 		    3Com 3c460 HomeConnect
@@ -220,6 +227,38 @@ Supported devices {:-include-:}:
 		    Zaapa ZNWUSB-54
 		    Zinwell ZWX-G261
 		    Zonet ZEW2500P
+		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
+		    3Com Aolynk WUB320g
+		    Abocom WUG2700
+		    Airlink101 AWLL5025
+		    Belkin F5D7050 ver 3
+		    Belkin F5D9050 ver 3
+		    Buffalo WLI-U2-SG54HP
+		    Buffalo WLI-U2-G54HP
+		    CNet CWD-854 ver F
+		    Conceptronic C54RU ver 2
+		    Corega CG-WLUSB2GO
+		    D-Link DWL-G122 rev C1
+		    D-Link WUA-1340
+		    Digitus DN-7003GR
+		    Edimax EW-7318USG
+		    Gigabyte GN-WB01GS
+		    Hawking HWUG1
+		    Hawking HWU54DM
+		    Hercules HWGUSB2-54-LB
+		    Hercules HWGUSB2-54V2-AP
+		    LevelOne WNC-0301USB v3
+		    Linksys WUSB54G rev C
+		    Linksys WUSB54GR
+		    Planex GW-US54HP
+		    Planex GW-US54Mini2
+		    Planex GW-USMM
+		    Senao NUB-3701
+		    Sitecom WL-113 ver 2
+		    Sitecom WL-172
+		    Sweex LW053
+		    TP-LINK TL-WN321G
+
 	Serial ports
 		On-board serial (com) ports
 		Most modems, digital cellular modems, and serial