Merge branch 'cma' into for-next

This commit is contained in:
Roland Dreier 2010-03-01 23:51:54 -08:00
commit e8094e667a

View file

@ -67,7 +67,6 @@ enum rdma_port_space {
RDMA_PS_IPOIB = 0x0002,
RDMA_PS_TCP = 0x0106,
RDMA_PS_UDP = 0x0111,
RDMA_PS_SCTP = 0x0183
};
struct rdma_addr {