[PATCH 01/22] ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'

[Linus Walleij]

On Thu, Aug 9, 2012 at 5:47 PM, Lee Jones <lee.jones at linaro.org> wrote:

> The platform attempts to register platform device 'snd_soc_u8500'
> which doesn't actually exist. Here we change the reference to the
> correct one 'snd_soc_mop500'.
>
> Signed-off-by: Lee Jones <lee.jones at linaro.org>

Applied to fixes. I will send this upstream for the -rc:s.

Yours,
Linus Walleij