Merge commit 'origin/HEAD' into test-merge

Manual fixup of include/asm-powerpc/pgtable-ppc64.h

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 26df06f840eb..50f22690d611 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -516,17 +516,23 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
         HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61"),
         HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
         HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
         HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p"),
         HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"),
         HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p"),
         { .ident = NULL }
 };