Messages in this thread | | | Date | Mon, 24 Nov 2014 18:28:49 +1100 | From | Stephen Rothwell <> | Subject | 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 driver-core tree.
I fixed it up (the former removed the file, so I did that) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |