linux-next: manual merge of the devicetree tree with the c6x tree

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: arch/c6x/kernel/setup.c between commit: 31b02fe54206 ("c6x: switch to NO_BOOTMEM") from the c6x tree and commit: be7cd2df1d22 ("c6x: use common built-in dtb support") from the devicetree tree. I fixed it up

linux-next: manual merge of the devicetree tree with the c6x tree

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: arch/c6x/kernel/setup.c between commit: 31b02fe54206 ("c6x: switch to NO_BOOTMEM") from the c6x tree and commit: be7cd2df1d22 ("c6x: use common built-in dtb support") from the devicetree tree. I fixed it up