Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
[linux-2.6] / drivers / telephony / ixj_pcmcia.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2