Merge upstream into 'upstream' branch of netdev-2.6.git.
[linux-2.6] / drivers / char / qtronix.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2