Merge bk://are.twiddle.net/pci-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc arch/alpha/kernel/sys_alcor.c
Simple merge

diff --cc arch/alpha/kernel/sys_cabriolet.c
Simple merge

diff --cc arch/alpha/kernel/sys_miata.c
Simple merge

diff --cc arch/alpha/kernel/sys_mikasa.c
Simple merge

diff --cc arch/alpha/kernel/sys_nautilus.c
Simple merge

diff --cc arch/alpha/kernel/sys_noritake.c
Simple merge

diff --cc arch/alpha/kernel/sys_ruffian.c
Simple merge

diff --cc arch/alpha/kernel/sys_sx164.c
Simple merge

diff --cc arch/alpha/kernel/sys_takara.c
Simple merge