Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

Tony noticed that a PCI fix he sent me was applied by both a PCI pull and an
x86 pull.  Unfortunately, the patches in each tree weren't identical and the
double application ended up removing some bfsort quirks for Dell machines.
Specifically it looks like the one that came in through Ingo & Thomas,
a1676072558854b95336c8f7db76b0504e909a0a, modified the end of the list, while
the one that I sent upstream, 8d64c781f0c5fbfdf8016bd1634506ff2ad1376a,
modified the entry above #ifdef __i386__, and with both applied we lose the
quirks for DL385 & DL585.

I fixed things up in my for-linus branch by reverting
a1676072558854b95336c8f7db76b0504e909a0a, matching the shortlog & diff below.

Thanks,
Jesse

Jesse Barnes (1):
      Revert "PCI: Correct last two HP entries in the bfsort whitelist"

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 940185e..6e64aaf 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_tab
 #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"),
                },
        },
        {}
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/