diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-03-14 17:42:57 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-03-14 17:42:57 -0400 |
| commit | 76b06402796c46566ea3794a999f718f144d93d2 (patch) | |
| tree | a2ab576fce6c86fa8e37d751b9bb7edd930bb95c /drivers/infiniband | |
| parent | 5a30247bf09eeffaa46c00d59a62359aeb7d0462 (diff) | |
| parent | 78a50a5e6068955494117b37b03379dacaf830b7 (diff) | |
| parent | 387add460dc2f61567fa127bd76dab8ba6833234 (diff) | |
| parent | 4c8ba94d1763e4c46564e59729cc0553ba1fddbb (diff) | |
| parent | 7cf20fc62428367bbf853a8d968804a6ec6a4973 (diff) | |
Merge branches 'ib_core', 'ib_ipoib', 'srpt', 'drain-cq-v4' and 'net/9p' into k.o/for-4.6