Merge by hand (conflicts between pending drivers and kfree cleanups)
[linux-2.6] / include / asm-mips / mach-ddb5074 /
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2