Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and...

[karo-tx-linux.git] / include / linux / drbd.h

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index d18d673ebc78e90a617670c80ca93e0f854ed70f..cec467f5d6768ae92f958058ab93f20edba28ec6 100644 (file)
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -36,7 +36,7 @@
 #include <sys/wait.h>
 #include <limits.h>
 
-/* Altough the Linux source code makes a difference between
+/* Although the Linux source code makes a difference between
    generic endianness and the bitfields' endianness, there is no
    architecture as of Linux-2.6.24-rc4 where the bitfileds' endianness
    does not match the generic endianness. */
@@ -184,7 +184,7 @@ enum drbd_conns {
        /* These temporal states are all used on the way
         * from >= C_CONNECTED to Unconnected.
         * The 'disconnect reason' states
-        * I do not allow to change beween them. */
+        * I do not allow to change between them. */
        C_TIMEOUT,
        C_BROKEN_PIPE,
        C_NETWORK_FAILURE,