Merge branch 'topic/beep-rename' into topic/core-change
[safe/jmp/linux-2.6] / Documentation / parport.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2