diff options
author | Doug Ledford <dledford@redhat.com> | 2016-03-21 22:32:23 +0100 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-03-21 22:32:23 +0100 |
commit | 520a07bff6fbb23cac905007d74c67058b189acb (patch) | |
tree | feef97d91e912f5028a469a417636363c9dd1650 /drivers/net | |
parent | i40iw: Replace the obsolete crypto hash interface with shash (diff) | |
parent | IB/ipoib: Allow mcast packets from other VFs (diff) | |
parent | IB/hfi1: Add SDMA cache eviction algorithm (diff) | |
download | linux-520a07bff6fbb23cac905007d74c67058b189acb.tar.xz linux-520a07bff6fbb23cac905007d74c67058b189acb.zip |
Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6