Auto merge with /home/aegl/GIT/linus
[sfrench/cifs-2.6.git] / arch / sparc / prom / mp.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2