Commit 737b0fbf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: correct mailing list address
  PCI: Correct last two HP entries in the bfsort whitelist
parents c110a2bd c1f69db7

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3143,7 +3143,7 @@ PCI ERROR RECOVERY 
P:	Linas Vepstas

M:	linas@austin.ibm.com

L:	linux-kernel@vger.kernel.org

L:	linux-pci@atrey.karlin.mff.cuni.cz

L:	linux-pci@vger.kernel.org

S:	Supported



PCI SUBSYSTEM

arch/x86/pci/common.c

+4 −4
Original line number Diff line number Diff line
@@ -302,18 +302,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { 
	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant DL385 G2",

		.ident = "HP ProLiant DL360",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant DL585 G2",

		.ident = "HP ProLiant DL380",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),

		},

	},

#ifdef __i386__