Grant Likely wrote: > On Thu, Aug 19, 2010 at 2:36 PM, Timur Tabi <timur@xxxxxxxxxxxxx> wrote: >> On Sun, Aug 1, 2010 at 2:57 AM, Grant Likely <grant.likely@xxxxxxxxxxxx> wrote: >> >>> sound/soc/fsl/mpc8610_hpcd.c | 4 +- >> >> This file is/was significantly rewritten for 2.6.37. I posted a fix >> to the alsa mailing list, but it will conflict with your patch. You >> might want to remove all changes to sound/soc/fsl from this commit. > > This change is already in Linus' tree. Then I suspect the ALSA guys are going to have a merge conflict coming up, because I had to make these changes to the -next branch. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
