Merge by Hand
[powerpc.git] / include / asm-mips / sn / kldir.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2