Merge wailua.hpl.hp.com:/bk/vanilla/linux-2.5
authorDavid Mosberger <davidm@wailua.hpl.hp.com>
Mon, 15 Apr 2002 01:07:38 +0000 (18:07 -0700)
committerDavid Mosberger <davidm@wailua.hpl.hp.com>
Mon, 15 Apr 2002 01:07:38 +0000 (18:07 -0700)
commit3f4533c3b362054e26462fdaa93098ae4824688e
tree6a7165ff84caab2c219076ec791c40eb83c83062
parent92ebc650938f5853ec7960a45610567c8fbf7f5a
parentbe0ff4bd5b7265f7f689b75e4dfb04e195eaa837
Merge wailua.hpl.hp.com:/bk/vanilla/linux-2.5
into wailua.hpl.hp.com:/bk/lia64/to-linus-2.5
include/linux/pci_ids.h