summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 13:13:06 +0200
committerMark Brown <broonie@kernel.org>2017-09-01 13:13:06 +0200
commit2e9ac12a00f1de285fc6fd77b9c9949b4bd7283f (patch)
tree9820f6aa1fffd0905d89de87764a86d2efba7ed1 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
parentMerge remote-tracking branches 'asoc/topic/rt5665', 'asoc/topic/rt5670', 'aso... (diff)
parentASoC: make clock direction configurable in asoc-simple (diff)
parentASoC: spear: constify snd_soc_dai_ops structures (diff)
parentASoC: sta32x: Remove unneeded gpiod NULL check (diff)
parentASoC: stm32: explicitly request exclusive reset control (diff)
parentASoC: sun4i-i2s: Add support for H3 (diff)
downloadlinux-2e9ac12a00f1de285fc6fd77b9c9949b4bd7283f.tar.xz
linux-2e9ac12a00f1de285fc6fd77b9c9949b4bd7283f.zip
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic/sta32x', 'asoc/topic/stm32' and 'asoc/topic/sunxi' into asoc-next