From owner-p4-projects@FreeBSD.ORG  Tue Mar 14 00:18:11 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7BB7616A426; Tue, 14 Mar 2006 00:18:11 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3C56216A401
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 00:18:11 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D443243D49
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 00:18:10 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2E0IAlC079668
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 00:18:10 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2E0IAsj079665
	for perforce@freebsd.org; Tue, 14 Mar 2006 00:18:10 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 14 Mar 2006 00:18:10 GMT
Message-Id: <200603140018.k2E0IAsj079665@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93273 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Mar 2006 00:18:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=93273

Change 93273 by peter@peter_daintree on 2006/03/14 00:17:30

	IFC @93272

Affected files ...

.. //depot/projects/hammer/share/man/man4/ipw.4#9 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#11 integrate
.. //depot/projects/hammer/share/man/man4/ral.4#8 integrate
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#38 integrate
.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#37 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#48 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#152 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#90 integrate
.. //depot/projects/hammer/sys/amd64/include/asmacros.h#14 integrate
.. //depot/projects/hammer/sys/amd64/include/bus.h#16 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#59 integrate
.. //depot/projects/hammer/sys/amd64/include/trap.h#8 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#34 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#33 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_rrip.c#8 integrate

Differences ...

==== //depot/projects/hammer/share/man/man4/ipw.4#9 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.9 2006/03/13 20:36:55 damien Exp $
+.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.10 2006/03/13 21:00:53 damien Exp $
 .\"
 .Dd March 13, 2006
 .Os
@@ -63,7 +63,6 @@
 For more information on configuring this device, see
 .Xr ifconfig 8 .
 .Pp
-.Pp
 This driver requires firmware to be loaded before it will work.
 You need to install the
 .Pa ports/net/ipw-firmware

==== //depot/projects/hammer/share/man/man4/iwi.4#11 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.11 2006/03/13 20:36:55 damien Exp $
+.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.12 2006/03/13 20:42:37 damien Exp $
 .\"
 .Dd March 13, 2006
 .Os
@@ -42,7 +42,7 @@
 .Ed
 .Pp
 Alternatively, to load the driver as a
-module at boot time, place the following line in
+module at boot time, place the following lines in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 if_iwi_load="YES"

==== //depot/projects/hammer/share/man/man4/ral.4#8 (text+ko) ====

@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ral.4,v 1.9 2006/03/05 20:57:25 damien Exp $
+.\" $FreeBSD: src/share/man/man4/ral.4,v 1.10 2006/03/13 21:24:28 damien Exp $
 .\"
 .Dd March 05, 2006
 .Os
@@ -58,7 +58,7 @@
 This chipset uses the MIMO (multiple-input multiple-output) technology with
 multiple antennas to extend the operating range of the adapter and to achieve
 higher throughput.
-MIMO will be the basis of the future IEEE 802.11n standard.
+MIMO is the basis of the forthcoming IEEE 802.11n standard.
 .Pp
 The transmit speed is user-selectable or can be adapted automatically by the
 driver depending on the received signal strength and on the number of hardware
@@ -68,87 +68,93 @@
 .Nm
 driver supports the following adapters:
 .Pp
-.Bl -column -compact ".Li Atlantis Land A02-PCM-W54" "CardBus" "RT2561S"
-.It Em Card Ta Em Bus Ta Em MAC/BBP
-.It Li "A-Link WL54H" Ta PCI Ta RT2560
-.It Li "A-Link WL54PC" Ta CardBus Ta RT2560
-.It Li "Amigo AWI-914W" Ta CardBus Ta RT2560
-.It Li "Amigo AWI-922W" Ta mini-PCI Ta RT2560
-.It Li "Amigo AWI-926W" Ta PCI Ta RT2560
-.It Li "AMIT WL531C" Ta CardBus Ta RT2560
-.It Li "AMIT WL531P" Ta PCI Ta RT2560
-.It Li "AOpen AOI-831" Ta PCI Ta RT2560
-.It Li "ASUS WL-107G" Ta CardBus Ta RT2560
-.It Li "ASUS WL-130g" Ta PCI Ta RT2560
-.It Li "Atlantis Land A02-PCI-W54" Ta PCI Ta RT2560
-.It Li "Atlantis Land A02-PCM-W54" Ta CardBus Ta RT2560
-.It Li "Belkin F5D7000 v3" Ta PCI Ta RT2560
-.It Li "Belkin F5D7010 v2" Ta CardBus Ta RT2560
-.It Li "Billionton MIWLGRL" Ta mini-PCI Ta RT2560
-.It Li "Canyon CN-WF511" Ta PCI Ta RT2560
-.It Li "Canyon CN-WF513" Ta CardBus Ta RT2560
-.It Li "CC&C WL-2102" Ta CardBus Ta RT2560
-.It Li "CNet CWC-854" Ta CardBus Ta RT2560
-.It Li "CNet CWP-854" Ta PCI Ta RT2560
-.It Li "Compex WL54G" Ta CardBus Ta RT2560
-.It Li "Compex WLP54G" Ta PCI Ta RT2560
-.It Li "Conceptronic C54RC" Ta CardBus Ta RT2560
-.It Li "Conceptronic C54Ri" Ta PCI Ta RT2560
-.It Li "Digitus DN-7001G-RA" Ta CardBus Ta RT2560
-.It Li "Digitus DN-7006G-RA" Ta PCI Ta RT2560
-.It Li "E-Tech WGPC02" Ta CardBus Ta RT2560
-.It Li "E-Tech WGPI02" Ta PCI Ta RT2560
-.It Li "Edimax EW-7108PCg" Ta CardBus Ta RT2560
-.It Li "Edimax EW-7128g" Ta PCI Ta RT2560
-.It Li "Eminent EM3036" Ta CardBus Ta RT2560
-.It Li "Eminent EM3037" Ta PCI Ta RT2560
-.It Li "Encore ENLWI-G-RLAM" Ta PCI Ta RT2560
-.It Li "Encore ENPWI-G-RLAM" Ta CardBus Ta RT2560
-.It Li "Fiberline WL-400P" Ta PCI Ta RT2560
-.It Li "Fibreline WL-400X" Ta CardBus Ta RT2560
-.It Li "Gigabyte GN-WIKG" Ta mini-PCI Ta RT2560
-.It Li "Gigabyte GN-WMKG" Ta CardBus Ta RT2560
-.It Li "Gigabyte GN-WPKG" Ta PCI Ta RT2560
-.It Li "Hawking HWC54GR" Ta CardBus Ta RT2560
-.It Li "Hawking HWP54GR" Ta PCI Ta RT2560
-.It Li "iNexQ CR054g-009 (R03)" Ta PCI Ta RT2560
-.It Li "JAHT WN-4054P" Ta CardBus Ta RT2560
-.It Li "JAHT WN-4054PCI" Ta PCI Ta RT2560
-.It Li "LevelOne WNC-0301 v2" Ta PCI Ta RT2560
-.It Li "LevelOne WPC-0301 v2" Ta CardBus Ta RT2560
-.It Li "Linksys WMP54G v4" Ta PCI Ta RT2560
-.It Li "Micronet SP906GK" Ta PCI Ta RT2560
-.It Li "Micronet SP908GK V3" Ta CardBus Ta RT2560
-.It Li "Minitar MN54GCB-R" Ta CardBus Ta RT2560
-.It Li "Minitar MN54GPC-R" Ta PCI Ta RT2560
-.It Li "MSI CB54G2" Ta CardBus Ta RT2560
-.It Li "MSI MP54G2" Ta mini-PCI Ta RT2560
-.It Li "MSI PC54G2" Ta PCI Ta RT2560
-.It Li "OvisLink EVO-W54PCI" Ta PCI Ta RT2560
-.It Li "PheeNet HWL-PCIG/RA" Ta PCI Ta RT2560
-.It Li "Pro-Nets CB80211G" Ta CardBus Ta RT2560
-.It Li "Pro-Nets PC80211G" Ta PCI Ta RT2560
-.It Li "Repotec RP-WB7108" Ta CardBus Ta RT2560
-.It Li "Repotec RP-WP0854" Ta PCI Ta RT2560
-.It Li "SATech SN-54C" Ta CardBus Ta RT2560
-.It Li "SATech SN-54P" Ta PCI Ta RT2560
-.It Li "Sitecom WL-112" Ta CardBus Ta RT2560
-.It Li "Sitecom WL-115" Ta PCI Ta RT2560
-.It Li "SparkLAN WL-685R" Ta CardBus Ta RT2560
-.It Li "Surecom EP-9321-g" Ta PCI Ta RT2560
-.It Li "Surecom EP-9321-g1" Ta PCI Ta RT2560
-.It Li "Surecom EP-9428-g" Ta CardBus Ta RT2560
-.It Li "Sweex LC500050" Ta CardBus Ta RT2560
-.It Li "Sweex LC700030" Ta PCI Ta RT2560
-.It Li "TekComm NE-9321-g" Ta PCI Ta RT2560
-.It Li "TekComm NE-9428-g" Ta CardBus Ta RT2560
-.It Li "Unex CR054g-R02" Ta PCI Ta RT2560
-.It Li "Unex MR054g-R02" Ta CardBus Ta RT2560
-.It Li "Zinwell ZWX-G160" Ta CardBus Ta RT2560
-.It Li "Zinwell ZWX-G360" Ta mini-PCI Ta RT2560
-.It Li "Zinwell ZWX-G361" Ta PCI Ta RT2560
-.It Li "Zonet ZEW1500" Ta CardBus Ta RT2560
-.It Li "Zonet ZEW1600" Ta PCI Ta RT2560
+.Bl -column -compact ".Li Atlantis Land A02-PCM-W54" "RT2561S" "CardBus"
+.It Em Card Ta Em MAC/BBP Ta Em Bus
+.It Li "A-Link WL54H" Ta RT2560 Ta PCI
+.It Li "A-Link WL54PC" Ta RT2560 Ta CardBus
+.It Li "AirLink101 AWLC5025" Ta RT2661 Ta CardBus
+.It Li "AirLink101 AWLH5025" Ta RT2661 Ta PCI
+.It Li "Amigo AWI-914W" Ta RT2560 Ta CardBus
+.It Li "Amigo AWI-922W" Ta RT2560 Ta mini-PCI
+.It Li "Amigo AWI-926W" Ta RT2560 Ta PCI
+.It Li "AMIT WL531C" Ta RT2560 Ta CardBus
+.It Li "AMIT WL531P" Ta RT2560 Ta PCI
+.It Li "AOpen AOI-831" Ta RT2560 Ta PCI
+.It Li "ASUS WL-107G" Ta RT2560 Ta CardBus
+.It Li "ASUS WL-130g" Ta RT2560 Ta PCI
+.It Li "Atlantis Land A02-PCI-W54" Ta RT2560 Ta PCI
+.It Li "Atlantis Land A02-PCM-W54" Ta RT2560 Ta CardBus
+.It Li "Belkin F5D7000 v3" Ta RT2560 Ta PCI
+.It Li "Belkin F5D7010 v2" Ta RT2560 Ta CardBus
+.It Li "Billionton MIWLGRL" Ta RT2560 Ta mini-PCI
+.It Li "Canyon CN-WF511" Ta RT2560 Ta PCI
+.It Li "Canyon CN-WF513" Ta RT2560 Ta CardBus
+.It Li "CC&C WL-2102" Ta RT2560 Ta CardBus
+.It Li "CNet CWC-854" Ta RT2560 Ta CardBus
+.It Li "CNet CWP-854" Ta RT2560 Ta PCI
+.It Li "Compex WL54G" Ta RT2560 Ta CardBus
+.It Li "Compex WLP54G" Ta RT2560 Ta PCI
+.It Li "Conceptronic C54RC" Ta RT2560 Ta CardBus
+.It Li "Conceptronic C54Ri" Ta RT2560 Ta PCI
+.It Li "Digitus DN-7001G-RA" Ta RT2560 Ta CardBus
+.It Li "Digitus DN-7006G-RA" Ta RT2560 Ta PCI
+.It Li "E-Tech WGPC02" Ta RT2560 Ta CardBus
+.It Li "E-Tech WGPI02" Ta RT2560 Ta PCI
+.It Li "Edimax EW-7108PCg" Ta RT2560 Ta CardBus
+.It Li "Edimax EW-7128g" Ta RT2560 Ta PCI
+.It Li "Eminent EM3036" Ta RT2560 Ta CardBus
+.It Li "Eminent EM3037" Ta RT2560 Ta PCI
+.It Li "Encore ENLWI-G-RLAM" Ta RT2560 Ta PCI
+.It Li "Encore ENPWI-G-RLAM" Ta RT2560 Ta CardBus
+.It Li "Fiberline WL-400P" Ta RT2560 Ta PCI
+.It Li "Fibreline WL-400X" Ta RT2560 Ta CardBus
+.It Li "Gigabyte GN-WI01GS" Ta RT2561S Ta mini-PCI
+.It Li "Gigabyte GN-WIKG" Ta RT2560 Ta mini-PCI
+.It Li "Gigabyte GN-WMKG" Ta RT2560 Ta CardBus
+.It Li "Gigabyte GN-WP01GS" Ta RT2561S Ta PCI
+.It Li "Gigabyte GN-WPKG" Ta RT2560 Ta PCI
+.It Li "Hawking HWC54GR" Ta RT2560 Ta CardBus
+.It Li "Hawking HWP54GR" Ta RT2560 Ta PCI
+.It Li "iNexQ CR054g-009 (R03)" Ta RT2560 Ta PCI
+.It Li "JAHT WN-4054P" Ta RT2560 Ta CardBus
+.It Li "JAHT WN-4054PCI" Ta RT2560 Ta PCI
+.It Li "LevelOne WNC-0301 v2" Ta RT2560 Ta PCI
+.It Li "LevelOne WPC-0301 v2" Ta RT2560 Ta CardBus
+.It Li "Linksys WMP54G v4" Ta RT2560 Ta PCI
+.It Li "Micronet SP906GK" Ta RT2560 Ta PCI
+.It Li "Micronet SP908GK V3" Ta RT2560 Ta CardBus
+.It Li "Minitar MN54GCB-R" Ta RT2560 Ta CardBus
+.It Li "Minitar MN54GPC-R" Ta RT2560 Ta PCI
+.It Li "MSI CB54G2" Ta RT2560 Ta CardBus
+.It Li "MSI MP54G2" Ta RT2560 Ta mini-PCI
+.It Li "MSI PC54G2" Ta RT2560 Ta PCI
+.It Li "OvisLink EVO-W54PCI" Ta RT2560 Ta PCI
+.It Li "PheeNet HWL-PCIG/RA" Ta RT2560 Ta PCI
+.It Li "Pro-Nets CB80211G" Ta RT2560 Ta CardBus
+.It Li "Pro-Nets PC80211G" Ta RT2560 Ta PCI
+.It Li "Repotec RP-WB7108" Ta RT2560 Ta CardBus
+.It Li "Repotec RP-WP0854" Ta RT2560 Ta PCI
+.It Li "SATech SN-54C" Ta RT2560 Ta CardBus
+.It Li "SATech SN-54P" Ta RT2560 Ta PCI
+.It Li "Sitecom WL-112" Ta RT2560 Ta CardBus
+.It Li "Sitecom WL-115" Ta RT2560 Ta PCI
+.It Li "SMC SMCWCB-GM" Ta RT2661 Ta CardBus
+.It Li "SMC SMCWPCI-GM" Ta RT2661 Ta PCI
+.It Li "SparkLAN WL-685R" Ta RT2560 Ta CardBus
+.It Li "Surecom EP-9321-g" Ta RT2560 Ta PCI
+.It Li "Surecom EP-9321-g1" Ta RT2560 Ta PCI
+.It Li "Surecom EP-9428-g" Ta RT2560 Ta CardBus
+.It Li "Sweex LC500050" Ta RT2560 Ta CardBus
+.It Li "Sweex LC700030" Ta RT2560 Ta PCI
+.It Li "TekComm NE-9321-g" Ta RT2560 Ta PCI
+.It Li "TekComm NE-9428-g" Ta RT2560 Ta CardBus
+.It Li "Unex CR054g-R02" Ta RT2560 Ta PCI
+.It Li "Unex MR054g-R02" Ta RT2560 Ta CardBus
+.It Li "Zinwell ZWX-G160" Ta RT2560 Ta CardBus
+.It Li "Zinwell ZWX-G360" Ta RT2560 Ta mini-PCI
+.It Li "Zinwell ZWX-G361" Ta RT2560 Ta PCI
+.It Li "Zonet ZEW1500" Ta RT2560 Ta CardBus
+.It Li "Zonet ZEW1600" Ta RT2560 Ta PCI
 .El
 .Pp
 An up to date list can be found at

==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#38 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.107 2005/12/14 21:47:01 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.108 2006/03/13 23:55:31 peter Exp $
  */
 
 /*

==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#37 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.73 2005/12/27 23:23:47 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#48 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.21 2006/02/28 22:24:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.22 2006/03/13 23:55:31 peter Exp $");
 
 #include "opt_atpic.h"
 #include "opt_isa.h"

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#152 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.646 2006/02/03 02:49:14 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.647 2006/03/13 23:55:31 peter Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"

==== //depot/projects/hammer/sys/amd64/amd64/trap.c#90 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.302 2006/02/08 08:09:15 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.303 2006/03/13 23:55:31 peter Exp $");
 
 /*
  * AMD64 Trap and System call handling

==== //depot/projects/hammer/sys/amd64/include/asmacros.h#14 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.29 2005/12/08 18:33:30 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.30 2006/03/14 00:01:56 peter Exp $
  */
 
 #ifndef _MACHINE_ASMACROS_H_

==== //depot/projects/hammer/sys/amd64/include/bus.h#16 (text+ko) ====

@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/bus.h,v 1.16 2005/05/29 04:42:15 nyan Exp $
+ * $FreeBSD: src/sys/amd64/include/bus.h,v 1.17 2006/03/14 00:01:56 peter Exp $
  */
 
 /*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/

==== //depot/projects/hammer/sys/amd64/include/pmap.h#59 (text+ko) ====

@@ -39,7 +39,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.128 2005/12/06 21:09:01 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.129 2006/03/14 00:01:56 peter Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_

==== //depot/projects/hammer/sys/amd64/include/trap.h#8 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/trap.h,v 1.14 2004/04/05 21:25:51 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/trap.h,v 1.15 2006/03/14 00:01:22 peter Exp $
  */
 
 #ifndef _MACHINE_TRAP_H_

==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#34 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.116 2006/01/06 19:22:18 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.117 2006/03/13 23:58:40 peter Exp $");
 
 #include "opt_cpu.h"
 

==== //depot/projects/hammer/sys/cam/scsi/scsi_da.c#33 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.186 2006/01/30 20:27:44 flz Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.187 2006/03/13 22:26:33 joerg Exp $");
 
 #include <sys/param.h>
 
@@ -421,6 +421,13 @@
 	},
 	{
 		/*
+		 * TOSHIBA TransMemory USB sticks
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "TOSHIBA", "TransMemory",
+		"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
 		 * PNY USB Flash keys
 		 * PR: usb/75578, usb/72344, usb/65436 
 		 */

==== //depot/projects/hammer/sys/isofs/cd9660/cd9660_rrip.c#8 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.28 2004/07/03 16:56:45 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.29 2006/03/13 22:32:33 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -157,9 +157,7 @@
 
 		case ISO_SUSP_CFLAG_ROOT:
 			/* Inserting slash for ROOT */
-			/* start over from beginning(?) */
-			outbuf -= len;
-			len = 0;
+			/* Double slash, nothing really to do here. */
 			break;
 
 		case ISO_SUSP_CFLAG_VOLROOT: