svn commit: r189240 - in stable/7/sys: . cam/scsi contrib/pf dev/ath/ath_hal dev/cxgb

[Scott Long]

Author: scottl
Date: Sun Mar  1 16:26:38 2009
New Revision: 189240
URL: http://svn.freebsd.org/changeset/base/189240

Log:
  Merge 181791: SCSI_DELAY is specified in milliseconds.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/cam/scsi/scsi_all.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/cam/scsi/scsi_all.c
==============================================================================
--- stable/7/sys/cam/scsi/scsi_all.c	Sun Mar  1 16:24:57 2009	(r189239)
+++ stable/7/sys/cam/scsi/scsi_all.c	Sun Mar  1 16:26:38 2009	(r189240)
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
 #endif /* !_KERNEL */
 
 /*
- * This is the default number of seconds we wait for devices to settle
+ * This is the default number of milliseconds we wait for devices to settle
  * after a SCSI bus reset.
  */
 #ifndef SCSI_DELAY