Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Wed, 30 Nov 2011 02:01:53 +0000 (18:01 -0800)
committerRoland Dreier <roland@purestorage.com>
Wed, 30 Nov 2011 02:01:53 +0000 (18:01 -0800)
commita493f1a24a496711d96b91c4dc0a1bd35eb6954b
tree6eaae9b9c9e42b8d2bf5a47324e2ea900d2d29a9
parent01b225e18fcb540c5d615ca79ef832473451f118
parent3874397c0bdec3c21ce071711cd105165179b8eb
parent580da35a31f91a594f3090b7a2c39b85cb051a12
parent8ee887d74b3d741991edaa1836d22636c28926d9
Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/ipoib/ipoib_multicast.c