Hi Lee,
Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/viperboard.c between commit b6684228726c ("mfd: viperboard:
Fix platform-device id collision") from Linus' tree and commit
5e65ea8c48e6 ("mfd: Use mfd_add_hotplug_devices() helper") from the mfd
tree.
I fixed it up (I just used the version from the mfd tree) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpdaLPqtpMYn.pgp
Description: OpenPGP digital signature
