summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorsanpei <sanpei@FreeBSD.org>2004-02-06 14:38:14 +0000
committersanpei <sanpei@FreeBSD.org>2004-02-06 14:38:14 +0000
commitaa54574435177367c0773c96685cf2e019574b8e (patch)
treee80f00085df73c95bcdb8efdf4e4da35de82d783 /sys/dev
parentf8f3e115d3c8253de677f6e7c78831b8ec18fab2 (diff)
downloadFreeBSD-src-aa54574435177367c0773c96685cf2e019574b8e.zip
FreeBSD-src-aa54574435177367c0773c96685cf2e019574b8e.tar.gz
MFNetBSD:
netbsd.org -> NetBSD.org(rev.1.109) fix typo in comment(rev.1.90) add list of ``already merged''
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/umass.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 927371d..3c4770c 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -28,6 +28,13 @@
* $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
*/
+/* Also already merged from NetBSD:
+ * $NetBSD: umass.c,v 1.67 2001/11/25 19:05:22 augustss Exp $
+ * $NetBSD: umass.c,v 1.90 2002/11/04 19:17:33 pooka Exp $
+ * $NetBSD: umass.c,v 1.108 2003/11/07 17:03:25 wiz Exp $
+ * $NetBSD: umass.c,v 1.109 2003/12/04 13:57:31 keihan Exp $
+ */
+
/*
* Universal Serial Bus Mass Storage Class specs:
* http://www.usb.org/developers/devclass_docs/usb_msc_overview_1.2.pdf
@@ -37,8 +44,8 @@
*/
/*
- * Ported to NetBSD by Lennart Augustsson <augustss@netbsd.org>.
- * Parts of the code written my Jason R. Thorpe <thorpej@shagadelic.org>.
+ * Ported to NetBSD by Lennart Augustsson <augustss@NetBSD.org>.
+ * Parts of the code written by Jason R. Thorpe <thorpej@shagadelic.org>.
*/
/*
OpenPOWER on IntegriCloud