On Wed, 01 Apr 2009 14:10:50 +0300 Antti Palosaari <crope@xxxxxx> wrote: > Mauro Carvalho Chehab wrote: > > On Tue, 31 Mar 2009 23:10:45 +0300 > > Antti Palosaari <crope@xxxxxx> wrote: > > > >> af9015: add support for AverMedia AVerTV Volar Black HD (A850) > > > > There were a small merge conflict on the last one, due to that patch you've > > sent me your ack: two #defines included at the same place. > > > > I solved it on the merge. Please check. > > It is correct. Here is ack if needed. > Acked-by: Antti Palosaari <crope@xxxxxx> Thanks. In general, I just silently fix such commit troubles, but, as some dvb usb devices has a count number of items at their tables, it is better to double check, if we are not violating it. > > > regards > Antti Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html