Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-03-15 16:23:54 -07:00
parent d14a0ebda7 a3d3203e4b
commit 4961e02f19
3607 changed files with 185532 additions and 86962 deletions
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -331,7 +331,7 @@ static int sa1100_irda_resume(struct platform_device *pdev)
 		 * If we missed a speed change, initialise at the new speed
 		 * directly.  It is debatable whether this is actually
 		 * required, but in the interests of continuing from where
-		 * we left off it is desireable.  The converse argument is
+		 * we left off it is desirable.  The converse argument is
 		 * that we should re-negotiate at 9600 baud again.
 		 */
 		if (si->newspeed) {