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

[~andy/linux] / Documentation / w1 / slaves / w1_ds28e04

diff --git a/Documentation/w1/slaves/w1_ds28e04 b/Documentation/w1/slaves/w1_ds28e04
index 85bc9a7e02feb966a987b91853ba05766247be62..7819b65cfa48ed4f8bd33ba48139754be1dd4212 100644 (file)
--- a/Documentation/w1/slaves/w1_ds28e04
+++ b/Documentation/w1/slaves/w1_ds28e04
@@ -24,7 +24,7 @@ Memory Access
 
        A write operation on the "eeprom" file writes the given byte sequence
        to the EEPROM of the DS28E04. If CRC checking mode is enabled only
-       fully alligned blocks of 32 bytes with valid CRC16 values (in bytes 30
+       fully aligned blocks of 32 bytes with valid CRC16 values (in bytes 30
        and 31) are allowed to be written.
 
 PIO Access