linux-next: manual merge of the arm-soc tree with the sound-asoc tree
From: tony@atomide.com (Tony Lindgren)
Date: 2012-09-20 22:01:54
Also in:
linux-next, lkml
* Stephen Rothwell [off-list ref] [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 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).OK thanks again. Tony