Re: linux-next: manual merge of the v4l-dvb tree with the i2c tree

Hi all, On Wed, 3 Apr 2013 12:12:57 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the v4l-dvb tree got a conflict in > drivers/media/pci/bt8xx/bttv-input.c between commit bf51a8c5e0b6 ("i2c: > Ignore return value of i2c_del_adapter()") from the i2c tree and commit > 457ba4ce4f43

linux-next: manual merge of the v4l-dvb tree with the i2c tree

Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in drivers/media/pci/bt8xx/bttv-input.c between commit bf51a8c5e0b6 ("i2c: Ignore return value of i2c_del_adapter()") from the i2c tree and commit 457ba4ce4f43 ("[media] bttv: move fini_bttv_i2c() from bttv-input.c to bttv-i2c.c