Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

diff --cc drivers/input/misc/wistron_btns.c
index ef7ee924ecc6795f023d4ac7747f9cf938c3760b,bac3085185fe6d3c38c48d28793262de9bea7ddb..b77e2692ba3aa8abaada92dc15d9c53d35e0b159
--- 1/drivers/input/misc/wistron_btns.c
--- 2/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@@ -330,16 -320,7 +330,16 @@@ static struct dmi_system_id dmi_ids[] 
                },
                .driver_data = keymap_acer_aspire_1500
        },
-       { 0, }
 +      {
 +              .callback = dmi_matched,
 +              .ident = "Acer TravelMate 240",
 +              .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 240"),
 +              },
 +              .driver_data = keymap_acer_travelmate_240
 +      },
+       { NULL, }
  };
  
  static int __init select_keymap(void)