Messages in this thread | | | Date | Thu, 20 Sep 2012 16:06:37 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the sound-asoc tree |
| |
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 2203747c9771 ("ARM: omap: move platform_data definitions") from the arm-soc tree.
The former removed the files, 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] | |