From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 27 Jan 2006 07:20:42 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~61
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2af5920b81a4cd0a22d40b6b2c38356d3df03e13;p=linux-2.6-omap-h63xx.git

Merge branch 'master'
---

2af5920b81a4cd0a22d40b6b2c38356d3df03e13
diff --cc include/linux/libata.h
index 5aa8b133f01,9e5db2949c5..6282bd553c4
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -133,12 -135,10 +136,12 @@@ enum 
  	ATA_QCFLAG_DMAMAP	= ATA_QCFLAG_SG | ATA_QCFLAG_SINGLE,
  
  	/* various lengths of time */
- 	ATA_TMOUT_EDD		= 5 * HZ,	/* hueristic */
+ 	ATA_TMOUT_EDD		= 5 * HZ,	/* heuristic */
  	ATA_TMOUT_PIO		= 30 * HZ,
- 	ATA_TMOUT_BOOT		= 30 * HZ,	/* hueristic */
- 	ATA_TMOUT_BOOT_QUICK	= 7 * HZ,	/* hueristic */
+ 	ATA_TMOUT_BOOT		= 30 * HZ,	/* heuristic */
+ 	ATA_TMOUT_BOOT_QUICK	= 7 * HZ,	/* heuristic */
 +	ATA_TMOUT_DATAOUT	= 30 * HZ,
 +	ATA_TMOUT_DATAOUT_QUICK	= 5 * HZ,
  	ATA_TMOUT_CDB		= 30 * HZ,
  	ATA_TMOUT_CDB_QUICK	= 5 * HZ,
  	ATA_TMOUT_INTERNAL	= 30 * HZ,