linux-next: manual merge of the trivial tree with the sound-asoctree

From: Stephen Rothwell
Date: Wed Apr 18 2012 - 23:58:52 EST

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
sound/soc/imx/Kconfig between commit a23dc694828e ("ASoC: imx: merge
sound/soc/imx into sound/soc/fsl") from the sound-asoc tree and commit
59bf89640647 ("Fix "the the" in various Kconfig") from the trivial tree.

The former merged the file into sound/soc/fsl/Kconfig (where the "the
the" now needs fixing). I have just removed sound/soc/imx/Kconfig.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature