Merge by hand (whitespace conflicts in libata.h)
[linux-2.6] / drivers / usb / serial / keyspan_pda.S
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2