Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git...
[pandora-kernel.git] / Documentation / parport.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2