Re: linux-next: manual merge of the arm-soc tree with the sound-asoc tree

2012-12-09 Thread Olof Johansson
On Sun, Dec 9, 2012 at 10:40 PM, Stephen Rothwell 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

linux-next: manual merge of the arm-soc tree with the sound-asoc tree

2012-12-09 Thread Stephen Rothwell
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 devic

Re: linux-next: manual merge of the arm-soc tree with the sound-asoc tree

2012-09-20 Thread Tony Lindgren
* Stephen Rothwell [120919 23:07]: > Hi all, > > Today's linux-next merge of the arm-soc tree got conflicts in > sound/soc/omap/igep0020.c, sound/soc/omap/omap3beagle.c, > sound/soc/omap/omap3evm.c and sound/soc/omap/overo.c between commit > 152c6e56f6a8 ("ASoC: Remove obsolete OMAP3 machine driv

linux-next: manual merge of the arm-soc tree with the sound-asoc tree

2012-09-19 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got conflicts in sound/soc/omap/igep0020.c, sound/soc/omap/omap3beagle.c, sound/soc/omap/omap3evm.c and sound/soc/omap/overo.c between commit 152c6e56f6a8 ("ASoC: Remove obsolete OMAP3 machine drivers") from the sound-asoc tree and commit 220374