Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / scsi / qla1280.c

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5dec684bf0103d5cb9fd244d5b3a706ab1109720..8ba5744c267e1ccd23894be93982d061dbb8f15e 100644 (file)
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -78,7 +78,7 @@
        - Clean up vchan handling
     Rev  3.23.33 July 3, 2003, Jes Sorensen
        - Don't define register access macros before define determining MMIO.
-         This just happend to work out on ia64 but not elsewhere.
+         This just happened to work out on ia64 but not elsewhere.
        - Don't try and read from the card while it is in reset as
          it won't respond and causes an MCA
     Rev  3.23.32 June 23, 2003, Jes Sorensen