Merge "ARM: dts: msm: fix a merge error in bus id macro"

#define ICBID_MASTER_PCNOC_INT_3 125

#define ICBID_MASTER_PCNOC_INT_3 125

#define ICBID_MASTER_PCNOC_INT_4 126

#define ICBID_MASTER_PCNOC_INT_4 126

#define ICBID_MASTER_PCNOC_INT_5 127

#define ICBID_MASTER_PCNOC_INT_5 127

#define ICBID_MASTER_PCNOC_INT_7 128

#define ICBID_MASTER_PCNOC_INT_6 128

#define ICBID_MASTER_PCIE_2 119

#define ICBID_MASTER_PCIE_2 119

#define ICBID_MASTER_MASTER_CNOC_A1NOC 116

#define ICBID_MASTER_MASTER_CNOC_A1NOC 116

#define ICBID_MASTER_A0NOC_SNOC 110

#define ICBID_MASTER_A0NOC_SNOC 110