summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2000-11-01 00:01:49 +0000
committerbmah <bmah@FreeBSD.org>2000-11-01 00:01:49 +0000
commitee4d4d54d2445bc8f34d6c513e2e6c173e56302b (patch)
treed801d57ff32ea91d52b1d0a3eed8deb3b924a8d5 /release
parent6883207ac06c74db2f2ccddbe8bdc4f1ade9ccd8 (diff)
downloadFreeBSD-src-ee4d4d54d2445bc8f34d6c513e2e6c173e56302b.zip
FreeBSD-src-ee4d4d54d2445bc8f34d6c513e2e6c173e56302b.tar.gz
Note MFC of uscanner(4).
Diffstat (limited to 'release')
-rw-r--r--release/texts/i386/RELNOTES.TXT2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 4cb02f7..1999c89 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -216,7 +216,7 @@ compatibles has been added. [MERGED]
The Inode Filesystem (IFS) has been added; more information can be
found in /usr/src/sys/ufs/ifs/README.
-The uscanner(4) driver for USB scanners has been added.
+The uscanner(4) driver for USB scanners has been added. [MERGED]
The ncv, nsp, and stg drivers have been ported from NetBSD/pc98.
They supports NCR 53C50 / Workbit Ninja SCSI-3 / TMC 18C30, 18C50
OpenPOWER on IntegriCloud