Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
[linux-flexiantxendom0-3.2.10.git] / Documentation / parport.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2