Re: [alsa-devel] [GIT PULL] ASoC updates for 2.6.36

On Mon, Aug 2, 2010 at 11:24 AM, Timur Tabi timur@freescale.com wrote:

Um, I was really expecting my code to be part of 2.6.36.  Why are we concerned with merge conflicts?  That's going to happen no matter what.

Never mind, Liam explained the whole thing to me on IRC. I'm just frustrated that code I wrote back in April won't be in a kernel release until the end of this year.