linux-next: manual merge of the drivers-x86 tree with Linus' tree

[Stephen Rothwell]

Hi Darren,

Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/ideapad-laptop.c between commit 9b071a43553d
("ideapad_laptop: Add Lenovo G40-30 to devices without radio switch")
from Linus' tree and commit 4fa9dabcffc8 ("ideapad_laptop: Lenovo
G50-30 fix rfkill reports wireless blocked") from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/platform/x86/ideapad-laptop.c
index b496db87bc05,1db3d2176d56..000000000000
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@@ -830,13 -830,13 +830,20 @@@ static void ideapad_acpi_notify(acpi_ha
   */
  static const struct dmi_system_id no_hw_rfkill_list[] = {
        {
 +              .ident = "Lenovo G40-30",
 +              .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
 +                      DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),
 +              },
 +      },
 +      {
+               .ident = "Lenovo G50-30",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G50-30"),
+               },
+       },
+       {
                .ident = "Lenovo Yoga 2 11 / 13 / Pro",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

pgpxZjwim2DoL.pgp
Description: OpenPGP digital signature