Hi Paul, Today's linux-next merge of the moduleh tree got a conflict in drivers/mfd/ab3550-core.c between commit 6508204630f4 ("mfd: Delete ab3550 driver") from the mfd tree and commit 4e36dd331423 ("mfd: Add module.h to the implicit drivers/mfd users") from the moduleh tree. The latter deleted the file, so I did that. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpB0ANioN2FC.pgp
Description: PGP signature