linux-next: manual merge of the moduleh tree with the mfd tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/mfd/ab3550-core.c between commit e085f9a2e27d ("mfd: Delete
ab3550 driver") from the mfd tree and commit afb68c4877b2 ("mfd: Add
module.h to the implicit drivers/mfd users") from the moduleh tree.

The former removes this file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature