Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

	arch/x86/mm/ioremap.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 0a9eaa736d9..00a319cd5be 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -330,18 +330,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
 #endif
         {
                 .callback = set_bf_sort,
-                .ident = "HP ProLiant DL360",
+                .ident = "HP ProLiant DL385 G2",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"),
                 },
         },
         {
                 .callback = set_bf_sort,
-                .ident = "HP ProLiant DL380",
+                .ident = "HP ProLiant DL585 G2",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
                 },
         },
         {}