On Tue, Nov 2, 2010 at 7:05 AM, Takashi Iwai <tiwai@xxxxxxx> wrote: > This patch conflicts with your previous patch that was already merged. > Could you rebase? > I created the patch against the alsa-kernel repository git://git.alsa-project.org/alsa-kernel.git where the previous patch hasn't been merged. I'll create the patch against git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git where it has been merged. Is that ok? -Mandar Joshi _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
