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

From: Stephen Rothwell
Date: Wed Jun 15 2011 - 22:41:11 EST


Hi all,

Today's linux-next merge of the sound-asoc tree failed badly. It seems
that it has been rebased on top of next-20110615. You cannot base a
tree in linux-next on linux-next itself!

I have used the version of the sound-asoc tree from next-20110615 for
today.


--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature