summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-03-21 22:32:23 +0100
committerDoug Ledford <dledford@redhat.com>2016-03-21 22:32:23 +0100
commit520a07bff6fbb23cac905007d74c67058b189acb (patch)
treefeef97d91e912f5028a469a417636363c9dd1650 /drivers/net
parenti40iw: Replace the obsolete crypto hash interface with shash (diff)
parentIB/ipoib: Allow mcast packets from other VFs (diff)
parentIB/hfi1: Add SDMA cache eviction algorithm (diff)
downloadlinux-520a07bff6fbb23cac905007d74c67058b189acb.tar.xz
linux-520a07bff6fbb23cac905007d74c67058b189acb.zip
Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6