Merge bk://kernel.bkbits.net/jgarzik/misc-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

arch/i386/pci/common.c

@@ -152,7 +152,7 @@ static int __init pcibios_init(void)
 	pci_cache_line_size = 32 >> 2;
 	if (c->x86 >= 6 && c->x86_vendor == X86_VENDOR_AMD)
 		pci_cache_line_size = 64 >> 2;	/* K7 & K8 */
-	else if (c->x86 > 6)
+	else if (c->x86 > 6 && c->x86_vendor == X86_VENDOR_INTEL)
 		pci_cache_line_size = 128 >> 2;	/* P4 */
 
 	pcibios_resource_survey();