Re: linux-next: manual merge of the sound-asoc tree
From: Mark Brown <hidden>
Date: 2012-02-03 10:51:51
Also in:
lkml
On Fri, Feb 03, 2012 at 12:59:02PM +1100, Stephen Rothwell wrote:
I fixed it up (I think - see below) and can carry the fix as necessary.
That's the correct fix, thanks. I'll resolve this in my tree once Linus' tree has merged the conflicting stuff.
Attachments
- signature.asc [application/pgp-signature] 836 bytes