linux-next: manual merge of the sound tree with Linus' tree

From: Stephen Rothwell
Date: Fri Apr 08 2011 - 00:38:40 EST

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
sound/soc/codecs/wm8994.c between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit f701a2e594e6 ("ASoC: Factor
WM8958 DSP2 handling into separate file") from the sound tree.

The latter moved the code changed by the former into another file. I did
not bother fixing the spelling errors there.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature