[lkml]   [2012]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the sound-asoc tree
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.
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-02-03 11:55    [W:0.044 / U:0.184 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site