linux-next: manual merge of the driver-core tree with the tegra tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/memory/tegra30-mc.c between commit a2257374a4bd ("memory: Add NVIDIA Tegra memory controller support") from the tegra tree and commit 0f0d7e7b022b ("memory: drop owner assignment from platform_drivers") from the

linux-next: manual merge of the driver-core tree with the tegra tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/iommu/tegra-smmu.c between commit a2257374a4bd ("memory: Add NVIDIA Tegra memory controller support") from the tegra tree and commit 98b773cf7b6b ("iommu: drop owner assignment from platform_drivers") from the

linux-next: manual merge of the driver-core tree with the tegra tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/iommu/tegra-smmu.c between commit a2257374a4bd (memory: Add NVIDIA Tegra memory controller support) from the tegra tree and commit 98b773cf7b6b (iommu: drop owner assignment from platform_drivers) from the

linux-next: manual merge of the driver-core tree with the tegra tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/memory/tegra30-mc.c between commit a2257374a4bd (memory: Add NVIDIA Tegra memory controller support) from the tegra tree and commit 0f0d7e7b022b (memory: drop owner assignment from platform_drivers) from the