Messages in this thread | | | Date | Tue, 17 Jul 2012 12:30:07 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the regulator tree with the mfd tree |
| |
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 sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |