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

[Mark Brown]

On Wed, Mar 14, 2012 at 05:06:28PM +1100, Stephen Rothwell wrote:

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

Looks good, 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/20120314/9d5228d4/attachment-0001.sig>