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

[pandora-kernel.git] / Documentation / scsi / ChangeLog.megaraid

diff --git a/Documentation/scsi/ChangeLog.megaraid b/Documentation/scsi/ChangeLog.megaraid
index 5e07d32..d2052fd 100644 (file)
--- a/Documentation/scsi/ChangeLog.megaraid
+++ b/Documentation/scsi/ChangeLog.megaraid
@@ -168,7 +168,7 @@ Older Version       : 2.20.4.6 (scsi module), 2.20.2.6 (cmm module)
 
 1.     Sorted out PCI IDs to remove megaraid support overlaps.
        Based on the patch from Daniel, sorted out PCI IDs along with
-       charactor node name change from 'megadev' to 'megadev_legacy' to avoid
+       character node name change from 'megadev' to 'megadev_legacy' to avoid
        conflict.
        ---
        Hopefully we'll be getting the build restriction zapped much sooner,