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

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/m68k/Kconfig
Simple merge

diff --cc arch/m68k/amiga/amiints.c
Simple merge

diff --cc arch/m68k/atari/ataints.c
Simple merge

diff --cc arch/m68k/kernel/process.c
Simple merge

diff --cc arch/m68k/mac/macints.c
Simple merge

diff --cc arch/m68k/sun3/sun3ints.c
Simple merge

diff --cc drivers/char/Makefile
Simple merge

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

diff --cc drivers/net/Makefile
Simple merge