Merge kroah.com:/home/greg/linux/BK/bleed-2.6

into kroah.com:/home/greg/linux/BK/pci-2.6

diff --cc arch/ppc64/kernel/pSeries_pci.c
Simple merge

diff --cc drivers/ide/pci/hpt366.c
Simple merge

diff --cc drivers/parisc/superio.c
Simple merge

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