aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-08 13:24:29 +0100
committerMark Brown <broonie@linaro.org>2013-09-08 13:24:29 +0100
commitbf06bec1f8b088965577b14eecaf532fe3ca1f58 (patch)
tree68717606745d17d6dff26c849d3db0cd1490d3b1 /Documentation
parent965abff8d8accdffc4af1b11fcf580e83031330a (diff)
parent85cdabba08d484bdcc4b25f0bbc23ac60c75aa5b (diff)
downloadvexpress-lsk-bf06bec1f8b088965577b14eecaf532fe3ca1f58.tar.gz
Merge tag 'v3.10.11' into linux-linaro-lsk
This is the 3.10.11 stable release
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/hwmon/k10temp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
index 90956b61802..4dfdc8f8363 100644
--- a/Documentation/hwmon/k10temp
+++ b/Documentation/hwmon/k10temp
@@ -12,6 +12,7 @@ Supported chips:
* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
+* AMD Family 16h processors: "Kabini"
Prefix: 'k10temp'
Addresses scanned: PCI space