Conflicts: openair1/PHY/LTE_TRANSPORT/defs.h openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c openair1/SCHED/phy_procedures_lte_eNb.c
Conflicts: openair1/PHY/LTE_TRANSPORT/defs.h openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c openair1/SCHED/phy_procedures_lte_eNb.c