8 Apr
2011
8 Apr
'11
8:29 a.m.
On Fri, Apr 8, 2011 at 02:14, Mark Brown wrote:
On Thu, Apr 07, 2011 at 10:32:21PM -0400, Mike Frysinger wrote:
sorry about that ... i was thinking there shouldnt be any conflicts in the codec since i'm the only one sending patches ;). but i guess you're referring to just the Kconfig ?
It was just Kconfig I think.
what git tree / branch did you merge into ? i checked tiwai's sound-2.6.git and the linux-2.6-asoc.git on opensource.wolfsonmicro.com, but couldnt see this changeset ...
My 2.6.40 on kernel.org.
ok, your manual merge looks fine of course. thanks. -mike