Merge changes from linux-2.6 by hand
[linux-2.6] / arch / m68k / sun3x /
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2