Merge remote-tracking branch 'wireless-next/main'

# Conflicts:
#	drivers/net/ethernet/broadcom/bnxt/bnxt.c