summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-01-30 03:07:03 +0300
committerDavid S. Miller <davem@davemloft.net>2017-01-30 03:07:03 +0300
commitf33f4ac3d3a6e29f1c5a9d8cd1058d298f4685f4 (patch)
tree0dc31f4a8d67dbc675a99c5e7def5aa10f058ab2 /net/ipv4
parent5b8784aaf29be20ba8d363e1124d7436d42ef9bf (diff)
parentfd0e97b806f0331df95f5fc58cdd488d169efb7f (diff)
downloadlinux-f33f4ac3d3a6e29f1c5a9d8cd1058d298f4685f4.tar.xz
Merge branch 'qcom-emac-misc'
Timur Tabi says: ==================== net: qcom/emac: Although not related, these patches affect the same files, so they should be applied in order. The first patch cleans up logging of when the the phy driver is attached. The second patch always configures the SGMII to use autonegotiation mode. The third patch removes a redundant call to emac_mac_start(). The fourth patch removes some extraneous non-functioning WOL code. The fifth patch adds an error handler for the SGMII block. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions