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

[sfrench/cifs-2.6.git] / Documentation / w1 / slaves / 00-INDEX

diff --git a/Documentation/w1/slaves/00-INDEX b/Documentation/w1/slaves/00-INDEX
index 8d76718e1ea26861cebb36a58f29aa023711ecf2..68946f83e579f580a0e7b5731f4b34b4eb26578e 100644 (file)
--- a/Documentation/w1/slaves/00-INDEX
+++ b/Documentation/w1/slaves/00-INDEX
@@ -10,3 +10,5 @@ w1_ds2438
        - The Maxim/Dallas Semiconductor ds2438 smart battery monitor.
 w1_ds28e04
        - The Maxim/Dallas Semiconductor ds28e04 eeprom.
+w1_ds28e17
+       - The Maxim/Dallas Semiconductor ds28e17 1-Wire-to-I2C Master Bridge.