]> git.hungrycats.org Git - linux/commit
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
authorGreg Kroah-Hartman <greg@kroah.com>
Tue, 19 Oct 2004 02:54:42 +0000 (19:54 -0700)
committerGreg Kroah-Hartman <greg@kroah.com>
Tue, 19 Oct 2004 02:54:42 +0000 (19:54 -0700)
commit0da96198166c0ca2321c078f8bd3bc8fe10a2717
treefcc09821ebcc1f0f1fe5d9f2b60274f87cae95dd
parent2a136606fe21b603a0ce484fc578f862f8e8384d
parentbeba877c69cae6cb53e0cf35ea39c68475d4fe81
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
28 files changed:
arch/i386/pci/i386.c
arch/ppc/kernel/pci.c
arch/sparc/kernel/pcic.c
drivers/block/cpqarray.c
drivers/char/agp/intel-agp.c
drivers/char/epca.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/message/fusion/mptbase.c
drivers/message/fusion/mptbase.h
drivers/net/typhoon.c
drivers/parport/parport_pc.c
drivers/pci/hotplug/shpchp_ctrl.c
drivers/pci/probe.c
drivers/pci/quirks.c
drivers/scsi/eata.c
drivers/scsi/megaraid/megaraid_mbox.c
drivers/scsi/nsp32.c
drivers/scsi/nsp32.h
drivers/usb/core/hcd-pci.c
drivers/usb/core/hcd.h
drivers/usb/gadget/goku_udc.c
drivers/usb/gadget/net2280.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ohci-pci.c
drivers/usb/host/uhci-hcd.c
drivers/video/i810/i810.h
drivers/video/i810/i810_main.c
drivers/video/riva/fbdev.c