]> git.hungrycats.org Git - linux/commit
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
authorGreg Kroah-Hartman <greg@kroah.com>
Mon, 23 Aug 2004 02:54:01 +0000 (19:54 -0700)
committerGreg Kroah-Hartman <greg@kroah.com>
Mon, 23 Aug 2004 02:54:01 +0000 (19:54 -0700)
commit9c46b04a4e3ecec0e96a188c5e68c10c8dd769d3
tree3312420dac83ed36178a171c691e21aace0af929
parent14729dbe26e736a6cc5479d3acb9e288b56a9a1b
parentb289a4b7b91abf6712f751da1694ffff9eb9dbe0
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
arch/ppc64/kernel/pSeries_pci.c
drivers/ide/pci/hpt366.c
drivers/parisc/superio.c
include/linux/pci_ids.h