summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-08-04 03:58:45 +0300
committerDoug Ledford <dledford@redhat.com>2016-08-04 03:58:45 +0300
commit3e5e8e8a9a059c15881abd582edcaf4d2f736caf (patch)
treeac545a54cddafdacae7387885b62e342fe982906 /drivers
parentfb92d8fb1b9c2de7d7d50c199e6d3020544702e8 (diff)
parent59c68ac31e15ad09d2cb04734e3c8c544a95f8d4 (diff)
parent321a9e3ebccb5e6b61bd4efbb98ae259c6b8609b (diff)
downloadlinux-3e5e8e8a9a059c15881abd582edcaf4d2f736caf.tar.xz
Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8