Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 1659f6c41458..42b632889dd8 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -41,7 +41,7 @@
 #define HDAPS_PORT_STATE        0x1611  /* device state */
 #define HDAPS_PORT_YPOS         0x1612  /* y-axis position */
 #define HDAPS_PORT_XPOS         0x1614  /* x-axis position */
-#define HDAPS_PORT_TEMP1        0x1616  /* device temperature, in celcius */
+#define HDAPS_PORT_TEMP1        0x1616  /* device temperature, in Celsius */
 #define HDAPS_PORT_YVAR         0x1617  /* y-axis variance (what is this?) */
 #define HDAPS_PORT_XVAR         0x1619  /* x-axis variance (what is this?) */
 #define HDAPS_PORT_TEMP2        0x161b  /* device temperature (again?) */
@@ -522,13 +522,15 @@ static int __init hdaps_init(void)
 {
         int ret;
 
-        /* Note that DMI_MATCH(...,"ThinkPad T42") will match "ThinkPad T42p" */
+        /* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
+          "ThinkPad T42p", so the order of the entries matters */
         struct dmi_system_id hdaps_whitelist[] = {
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),
                 HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad R52"),
+                HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),    /* R52 (1846AQG) */
                 HDAPS_DMI_MATCH_INVERT("ThinkPad T41p"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad T41"),
                 HDAPS_DMI_MATCH_INVERT("ThinkPad T42p"),
@@ -536,9 +538,9 @@ static int __init hdaps_init(void)
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad T43"),
                 HDAPS_DMI_MATCH_LENOVO("ThinkPad T60p"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad X40"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad X41 Tablet"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"),
                 HDAPS_DMI_MATCH_LENOVO("ThinkPad X60"),
+                HDAPS_DMI_MATCH_NORMAL("ThinkPad Z60m"),
                 { .ident = NULL }
         };