Subject: Re: linux-next: manual merge of the sound-asoc tree with the samsung tree

From: Mark Brown <[email-masked]>
Date: Tue, 17 Aug 2010 10:30:14 +0100

On Tue, Aug 17, 2010 at 12:21:37PM +1000, Stephen Rothwell wrote:

> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/arm/mach-s3c64xx/mach-smdk6410.c between commit
> 96e9d908a7b5b5be774ba26aca0d6633e7c97f63 ("ARM: SMDK6410: Register AC97
> controller") from the samsung tree and commit
> f0fba2ad1b6b53d5360125c41953b7afcd6deff0 ("ASoC: multi-component - ASoC
> Multi-Component Support") from the sound-asoc tree.

Oh dear, the AC'97 controller addition was supposed to make it into
2.6.36.

> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Thanks.