Merge http://linux.bkbits.net/linux-2.5

into neo.rr.com:/home/ambx1/linux/bk/linus-2.5

diff --cc drivers/pnp/Kconfig
Simple merge

diff --cc drivers/pnp/pnpbios/core.c
Simple merge

diff --cc drivers/serial/8250_pnp.c
Simple merge

diff --cc scripts/file2alias.c
Simple merge