Note the MFC of ATA100 support into the ata(4) driver and update the

list of ATA controllers currently supported.

3 files changed, 6 insertions, 2 deletions

diff --git a/release/texts/HARDWARE.TXT b/release/texts/HARDWARE.TXT
index 8f7eaf0..2a30d2d 100644
--- a/release/texts/HARDWARE.TXT
+++ b/release/texts/HARDWARE.TXT
@@ -335,14 +335,18 @@ ATA controllers:
     CMD 646
     Cypress 82C693
     HighPoint HPT366
+    HighPoint HPT370
     Intel PIIX
     Intel PIIX3
     Intel PIIX4
     Intel ICH
+    Intel ICH2
     Promise Fasttrak-33
     Promise Fasttrak-66
+    Promise Fasttrak-100
     Promise Ultra-33
     Promise Ultra-66
+    Promise Ultra-100
     SiS 5591
     VIA 82C586
     VIA 82C686
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index a898ef1..019d60f 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -83,7 +83,7 @@ accept_filters, a kernel feature to reduce overheads when accepting
 and reading new connections on listening sockets, has been added.
 [MERGED]
 
-The ata(4) driver now has experimental support for ATA100 controllers.
+The ata(4) driver now has support for ATA100 controllers. [MERGED]
 
 AlphaServer 1200 ("Tincup") has been tested and works OK. Currently it does
 not want to boot from CD or floppy but a transplanted disk that was
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index d8f045f..924cb28 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -101,7 +101,7 @@ accept_filters, a kernel feature to reduce overheads when accepting
 and reading new connections on listening sockets, has been added.
 [MERGED]
 
-The ata(4) driver now has experimental support for ATA100 controllers.
+The ata(4) driver now has support for ATA100 controllers. [MERGED]
 
 
 1.2. SECURITY FIXES