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

On Mon, Aug 2, 2010 at 5:30 AM, Liam Girdwood lrg@slimlogic.co.uk wrote:

Ok, the multi-component branch does touch arch quite a bit as we are adding platform devices for all our components. So it's probably safer for merging (after your pull request) in the for 2.6.37 period to reduce any merge conflict with arch.

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.