Manual merge with Linus
[powerpc.git] / arch / mips / dec / prom / dectypes.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2