Hi all,
Today's linux-next merge of the regulator tree got a conflict in
include/linux/mfd/s5m87xx/s5m-core.h between commits from the mfd tree
and commit c848bc8538cd ("regulator: s5m8767a: Support AP watchdog reset
operation") from the regulator tree.This file was renamed (twice) in the mfd tree, so I removed the version in the regulator tree. The changes from the regulator tree turned up in an mfd tree commit as well. -- Cheers, Stephen Rothwell [email protected]
pgpG31vXf1PnZ.pgp
Description: PGP signature
