6 Dec
2010
6 Dec
'10
3:35 p.m.
At Mon, 6 Dec 2010 14:33:19 +0000, Mark Brown wrote:
On Mon, Dec 06, 2010 at 03:31:56PM +0100, Takashi Iwai wrote:
This gave a conflict with topic/asoc branch, and so I merged and resolved manually now.
I've got a pull request coming right now for the topic/asoc branch which already resolves this :/ Just waiting for kernel.org to mirror it out.
OK, then I'll revert topic/asoc branch. No big issue :)
Takashi