Merge branch 'from-linus' into upstream
[cascardo/linux.git] / Documentation / paride.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2