Merge branch 'linus' into x86/x2apic
[linux-2.6] / include / linux / if_infiniband.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2