-
Haruki NAOI authored
(cherry picked from commit eae86561aea29b07afbcda79b6c2ad90162069f6) # Conflicts: # openair2/ENB_APP/enb_config.c # openair2/LAYER2/MAC/eNB_scheduler_fairRR.c # targets/RT/USER/lte-enb.c # targets/RT/USER/lte-ru.c
b285e2f6
(cherry picked from commit eae86561aea29b07afbcda79b6c2ad90162069f6) # Conflicts: # openair2/ENB_APP/enb_config.c # openair2/LAYER2/MAC/eNB_scheduler_fairRR.c # targets/RT/USER/lte-enb.c # targets/RT/USER/lte-ru.c