linux-next: manual merge of the sound-asoc tree with the mvebu tree

[Mark Brown]

On Mon, Feb 24, 2014 at 01:37:52PM +1100, Stephen Rothwell wrote:

> I fixed it up (Probably incorrectly - see below) and can carry the fix as
> necessary (no action is required).

That looks right (or at least like it won't do any harm or cause
bisection problems), thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140224/96551577/attachment.sig>