Merge branch 'linus' into test
[h-e-n] / Documentation / parport.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2