Merge kroah.com:/home/greg/linux/BK/bleed-2.6

author Greg Kroah-Hartman <greg@kroah.com>

Wed, 14 Apr 2004 06:33:29 +0000 (23:33 -0700)

committer Greg Kroah-Hartman <greg@kroah.com>

Wed, 14 Apr 2004 06:33:29 +0000 (23:33 -0700)
author Greg Kroah-Hartman <greg@kroah.com>
Wed, 14 Apr 2004 06:33:29 +0000 (23:33 -0700)
committer Greg Kroah-Hartman <greg@kroah.com>
Wed, 14 Apr 2004 06:33:29 +0000 (23:33 -0700)
diff --cc arch/i386/pci/irq.c
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
author	Greg Kroah-Hartman <greg@kroah.com>
	Wed, 14 Apr 2004 06:33:29 +0000 (23:33 -0700)
committer	Greg Kroah-Hartman <greg@kroah.com>
	Wed, 14 Apr 2004 06:33:29 +0000 (23:33 -0700)
		1	2
arch/i386/pci/irq.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history