]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Tue, 29 Nov 2011 21:37:18 +0000 (13:37 -0800)
committerRoland Dreier <roland@purestorage.com>
Tue, 29 Nov 2011 21:37:18 +0000 (13:37 -0800)
1  2  3  4 
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/ipoib/ipoib_multicast.c

Simple merge