On Sun, Dec 9, 2012 at 10:40 PM, Stephen Rothwell [off-list ref] wrote:

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-samsung/include/plat/devs.h between commit a08485d8fdf6
("ASoC: Samsung: Do not register samsung audio dma device as pdev") from
the sound-asoc tree and commit 0a9d5ac307ae ("ARM: EXYNOS: removing
exynos-drm device registration from non-dt platforms") from the arm-soc
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Looks good, thanks.


-Olof