Merge branch 'upstream' into upstream-jgarzik
[linux-2.6] / include / linux / com20020.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2