summaryrefslogtreecommitdiffstats
path: root/include/rdma
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-07-08 11:22:11 -0700
committerRoland Dreier <roland@purestorage.com>2013-07-08 11:22:11 -0700
commit0eba55114838059b873b173f1115cd5c5bab3dfd (patch)
tree3cfba17b60991a7f316f54c16071da5b871f53bc /include/rdma
parentce117ffac2e933344d0ea01b1cb3b56627fcb6e7 (diff)
parent21bfd4706268c85c9d17ca2fd48de3b19c9d40db (diff)
parentda183c7af8444cb2c1beedaa498a9359f19ff665 (diff)
parent582c016e68dc5dfea4d3582512157f165a428149 (diff)
parentc94e15c5cb4d02579321382871eb87e17d10858e (diff)
parent22baa407f9e67636a3fd740a552f8f5e06cf8db5 (diff)
parente8ca413558de8ea235a1223074c4ed09616b9034 (diff)
downloadlinux-0eba55114838059b873b173f1115cd5c5bab3dfd.tar.bz2
Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next