30 Jan
2012
30 Jan
'12
3:51 p.m.
On Mon, Jan 30, 2012 at 03:27:40PM +0100, Takashi Iwai wrote:
But this brings merge conflicts in codecs/wm5100.c. If you already resolved in 3.4 branch, please give it, too.
It's resolved in my for-next branch but not in my 3.4 branch, I'd been going to merge up an -rc when one appeared with the relevant commits. If you want to pull my for-next into your for-next that'd solve the issue for your -next tree which is the issue I guess?