Merge wailua.hpl.hp.com:/bk/vanilla/linux-2.5
authorDavid Mosberger <davidm@wailua.hpl.hp.com>
Wed, 10 Apr 2002 13:21:40 +0000 (06:21 -0700)
committerDavid Mosberger <davidm@wailua.hpl.hp.com>
Wed, 10 Apr 2002 13:21:40 +0000 (06:21 -0700)
commit6db4803359c157ab1c57c59a3499613fc0e74a72
tree223ee162bc10f1d50e7e6f0c22329077edccff40
parent22e962f9b7a7abbc2d17ceaf3917bb8e67b68a8f
parent1f8ea4d11e0b5f1ab5d53f8ac6177f380fd7cb02
Merge wailua.hpl.hp.com:/bk/vanilla/linux-2.5
into wailua.hpl.hp.com:/bk/lia64/to-linus-2.5
arch/ia64/kernel/ia64_ksyms.c
drivers/pci/pci.ids
include/asm-ia64/unistd.h
include/linux/pci_ids.h