summaryrefslogtreecommitdiffstats
path: root/Documentation/w1/slaves/00-INDEX
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-18 17:09:40 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-18 17:09:40 +0100
commitba4b60e85d6c5fc2242fd24e131a47fb922e5d89 (patch)
tree6be918ce3924d0677bc1029f7d1255fef48a8f85 /Documentation/w1/slaves/00-INDEX
parentDrivers: hv: Ballon: Make pressure posting thread sleep interruptibly (diff)
parentLinux 3.14-rc3 (diff)
downloadlinux-ba4b60e85d6c5fc2242fd24e131a47fb922e5d89.tar.xz
linux-ba4b60e85d6c5fc2242fd24e131a47fb922e5d89.zip
Merge 3.14-rc3 into char-misc-next
We need the fixes here for future mei and other patches. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/w1/slaves/00-INDEX')
-rw-r--r--Documentation/w1/slaves/00-INDEX2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/w1/slaves/00-INDEX b/Documentation/w1/slaves/00-INDEX
index 75613c9ac4db..6e18c70c3474 100644
--- a/Documentation/w1/slaves/00-INDEX
+++ b/Documentation/w1/slaves/00-INDEX
@@ -4,3 +4,5 @@ w1_therm
- The Maxim/Dallas Semiconductor ds18*20 temperature sensor.
w1_ds2423
- The Maxim/Dallas Semiconductor ds2423 counter device.
+w1_ds28e04
+ - The Maxim/Dallas Semiconductor ds28e04 eeprom.