Merge remote-tracking branch 'tip/auto-latest'

[karo-tx-linux.git] / Documentation / fmc / carrier.txt

diff --git a/Documentation/fmc/carrier.txt b/Documentation/fmc/carrier.txt
index 173f6d65c88da3bf3bd1653f4d2fa3817c487240..5e4f1dd3e98b3c4327cb65a8b9a1f259305efa32 100644 (file)
--- a/Documentation/fmc/carrier.txt
+++ b/Documentation/fmc/carrier.txt
@@ -213,7 +213,7 @@ The individual methods perform the following tasks:
      methods: for example the SPEC driver may define that its carrier
      I2C memory is seen at offset 1M and the internal SPI flash is seen
      at offset 16M.  This multiplexing of several flash memories in the
-     same address space is is carrier-specific and should only be used
+     same address space is carrier-specific and should only be used
      by a driver that has verified the `carrier_name' field.