Merge master.kernel.org:/home/davem/BK/sparc-2.5

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

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

diff --cc arch/sparc/defconfig
Simple merge

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

diff --cc drivers/video/aty/atyfb_base.c
Simple merge

diff --cc drivers/video/pm2fb.c
Simple merge

diff --cc drivers/video/sbusfb.c
Simple merge

diff --cc include/asm-sparc/unistd.h
Simple merge

diff --cc include/asm-sparc64/unistd.h
Simple merge