summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2015-10-26 14:48:22 +0000
committerLee Jones <lee.jones@linaro.org>2015-10-26 14:48:22 +0000
commit74b533c529f88b7ae4d607276916f9d8d44571f5 (patch)
tree3f89a9f93689bf42c93b6a600ad66cc631addf6c /drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
parent6c20b934247875f41fe9bcc74072bb072b4f28d8 (diff)
parent40d8edc9bf056ea83e50152a4ccd33048d26ccde (diff)
parent1d7f833fd182c989a7f0d2861a68acbee99865cf (diff)
parentb4fe8ba7a310da6a2b99e3abe67c7815198cde49 (diff)
parent7e50711993552800644a4667daa0f569a7665eca (diff)
Merge branches 'ib-extcon-mfd-4.4', 'ib-mfd-i2c-v4.4', 'ib-mfd-power-4.4', 'ib-mfd-regmap-4.4' and 'ib-mfd-regulator-4.4' into ibs-for-mfd-merged