]> git.hungrycats.org Git - linux/commitdiff
Merge
authorGreg Kroah-Hartman <greg@kroah.com>
Mon, 30 Dec 2002 05:49:02 +0000 (21:49 -0800)
committerGreg Kroah-Hartman <greg@kroah.com>
Mon, 30 Dec 2002 05:49:02 +0000 (21:49 -0800)
1  2 
include/linux/pci.h

Simple merge