linux-next: manual merge of the mfd tree with the i2c tree
From: Stephen Rothwell
Date: Tue Mar 02 2010 - 22:47:41 EST
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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature