Merge bk://lia64.bkbits.net/to-linus-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

diff --cc Makefile
Simple merge

diff --cc arch/ia64/sn/io/pci_bus_cvlink.c
Simple merge

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

diff --cc fs/exec.c
Simple merge

diff --cc include/asm-ia64/sn/pci/pcibr.h
Simple merge

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