On Sun, Dec 9, 2012 at 10:40 PM, Stephen Rothwell <[email protected]> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
