Merge wailua.hpl.hp.com:/bk/vanilla/linux-2.5

into wailua.hpl.hp.com:/bk/lia64/to-linus-2.5

diff --cc arch/ia64/kernel/ia64_ksyms.c
Simple merge

diff --cc drivers/pci/pci.ids
Simple merge

diff --cc include/asm-ia64/unistd.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge