Merge branch 'merge'
[linux-2.6] / arch / sparc / prom / palloc.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2