Hi Samuel, Today's linux-next merge of the mfd tree got a conflict in drivers/i2c/busses/i2c-isch.c between commit 482b522a6ced62506aba1c139cb9d4b73e7312f5 ("i2c: Make PCI device ids constant") from the i2c tree and commit 1fc8fe094a8ebcc09817246277250898a8d2fc5a ("i2c: convert i2c-isch to platform_device") from the mfd tree. The latter removes the code modified by the former, so I used the latter. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpogB9VtZl2i.pgp
Description: PGP signature