rmagueta 345f3056ff Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs ...

# Conflicts:
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h

2022-04-06 10:51:43 +01:00

..

nr_compute_tbs_common.c

Enhancements to the overall MAC logging

2021-11-05 16:05:10 +01:00

nr_mac_common.c

Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs

2022-04-06 10:51:43 +01:00

nr_mac_common.h

Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs

2022-04-06 10:51:43 +01:00

nr_mac_extern.h

Merge branch 'eurecom-develop' into episys/mel/sa_development_init

2021-11-03 08:54:06 -07:00

nr_mac.h

Fixing MR based on OAI feedback

2021-11-08 10:59:28 -08:00