Subject: linux-next: manual merge of the sound-asoc tree with the i.MX tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 30 Sep 2010 11:23:02 +1000

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-mx3/devices.c between commit
4697bb926f43b8012ebd111ef43834f42126a0ef ("ARM: imx: dynamically allocate
imx-ssi devices") from the i.MX tree and commit
f0fba2ad1b6b53d5360125c41953b7afcd6deff0 ("ASoC: multi-component - ASoC
Multi-Component Support") from the sound-asoc tree.

The former removed that code that the latter changed.  I just used the
former.

The latter was just changing some names, so ti may be able to be
integrated into the former.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/