Merge commit 'origin' into master
[linux-2.6] / include / linux / cycx_cfm.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2