Merge remote-tracking branch 'pm/linux-next'

Conflicts:
	arch/x86/pci/acpi.c

diff --cc arch/x86/pci/acpi.c
index 0c01261fe5a846bc2500fc24c1ff56c2b432e86f,7010c199b4f0ee68db45a54e85bd0cd08bac6229..78ae6c7f8c10c13aac576599bd2bff3a45040437
--- 1/arch/x86/pci/acpi.c
--- 2/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@@ -107,16 -98,16 +107,27 @@@ static const struct dmi_system_id pci_c
                        DMI_MATCH(DMI_BIOS_VERSION, "6JET85WW (1.43 )"),
                },
        },
 +
 +      /* https://bugzilla.kernel.org/show_bug.cgi?id=15362 */
 +      {
 +              .callback = set_ignore_seg,
 +              .ident = "HP xw9300",
 +              .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "HP xw9300 Workstation"),
 +              },
 +      },
++
+       /* https://bugzilla.kernel.org/show_bug.cgi?id=47981 */
+       {
+               .callback = set_nouse_crs,
+               .ident = "CheckPoint P-20-00",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "CheckPoint"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P-20-00"),
+                       DMI_MATCH(DMI_BOARD_NAME, "Bridgeport"),
+               },
+       },
        {}
  };
  

diff --cc drivers/acpi/pci_irq.c
Simple merge

diff --cc drivers/base/platform.c
Simple merge

diff --cc drivers/mtd/nand/sh_flctl.c
Simple merge