Merge home.transmeta.com:/home/torvalds/v2.5/akpm

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

diff --cc arch/i386/config.in
Simple merge

diff --cc arch/sparc64/mm/init.c
Simple merge

diff --cc drivers/block/ll_rw_blk.c
Simple merge

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

diff --cc fs/bio.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/mpage.c
Simple merge

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

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

diff --cc init/main.c
Simple merge

diff --cc kernel/ksyms.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/page_io.c
Simple merge