tree c0adb8f38bcdad945ad28c36b55694e0e2491a9b
parent 79a3aaa7b82e3106be97842dedfd8429248896e6
parent 3eed52842b9fd291233c15f65fed34c5d3241183
author Bob Copeland <me@bobcopeland.com> 1554304394 -0400
committer Bob Copeland <me@bobcopeland.com> 1554304394 -0400

Merge remote-tracking branch 'net-next/master'

# Conflicts:
#	drivers/staging/mt7621-eth/mtk_eth_soc.c