summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-04 09:03:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-04 09:03:41 -0700
commit20d9d9a0544436b1b8c94689c01d746d6bd5525c (patch)
tree3a6db09d7855c77b1bc70d46fa6263ffaeef10c1 /Documentation
parent7114a72ff850ac6f8f5336c510a5a874c9eadf42 (diff)
parente16de9137c8beab02d78fb4fa82bb96e9f3d0ac3 (diff)
downloadlinux-stable-20d9d9a0544436b1b8c94689c01d746d6bd5525c.tar.gz
linux-stable-20d9d9a0544436b1b8c94689c01d746d6bd5525c.tar.bz2
linux-stable-20d9d9a0544436b1b8c94689c01d746d6bd5525c.zip
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon patches from Guenter Roeck: - Fix crash in ad7314 driver - Add support for AMD Trinity CPUs to k10temp driver - Fix __initdata/__initconst mixup in w83627ehf driver - Fix runtime warnings in acpi_power_meter and max6639 drivers - Fix build warnings in adm1031, f75375s, sht15, and gpio-fan drivers * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (ad7314) Adds missing spi_dev initialization hwmon: (k10temp) Add support for AMD Trinity CPUs hwmon: (w83627ehf) mark const init data with __initconst instead of __initdata hwmon: (acpi_power_meter) fix lockdep spew due to non-static lock class hwmon: (adm1031) Fix compiler warning hwmon: (f75375s) Fix warning message seen in some configurations hwmon: (max6639) Convert to dev_pm_ops hwmon: (sht15) Fix Kconfig dependencies hwmon: (gpio-fan) Fix Kconfig dependencies
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/hwmon/k10temp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
index a10f73624ad3..90956b618025 100644
--- a/Documentation/hwmon/k10temp
+++ b/Documentation/hwmon/k10temp
@@ -11,7 +11,7 @@ Supported chips:
Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)
* 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"
+* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
Prefix: 'k10temp'
Addresses scanned: PCI space