linux-next: manual merge of the samsung-krzk tree with the renesas tree

Hi Krzysztof, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm/configs/multi_v7_defconfig between commit: 954ceafd50cf ("ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes") from the renesas tree and commit: 23a526f0478c ("ARM:

linux-next: manual merge of the samsung-krzk tree with the renesas tree

Hi Krzysztof, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm/configs/multi_v7_defconfig between commit: 954ceafd50cf ("ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes") from the renesas tree and commit: 23a526f0478c ("ARM: