Merge branch 'fix/hda' into for-linus
[linux-2.6.git] / Documentation / parport.txt
2005-04-16 Linus Torvalds Linux-2.6.12-rc2