Re: linux-next: manual merge of the regulator tree with the mfd tree

On Monday 26 November 2012 11:14 AM, Stephen Rothwell wrote: * PGP Signed by an unknown key Hi all, Today's linux-next merge of the regulator tree got a conflict in include/linux/mfd/tps65090.h between commit 3863db3e800c ("mfd: tps65090: Remove unused member of struct tps65090") from the mfd

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/tps65090.h between commit 3863db3e800c ("mfd: tps65090: Remove unused member of struct tps65090") from the mfd tree and commit 24282a1ca33b ("regulator: tps65090: Register all regulators in single probe

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/tps65090.h between commit 3863db3e800c (mfd: tps65090: Remove unused member of struct tps65090) from the mfd tree and commit 24282a1ca33b (regulator: tps65090: Register all regulators in single probe call)

Re: linux-next: manual merge of the regulator tree with the mfd tree

On Monday 26 November 2012 11:14 AM, Stephen Rothwell wrote: * PGP Signed by an unknown key Hi all, Today's linux-next merge of the regulator tree got a conflict in include/linux/mfd/tps65090.h between commit 3863db3e800c (mfd: tps65090: Remove unused member of struct tps65090) from the mfd

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

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 conflicts in drivers/regulator/s5m8767.c between commit 63063bfbffe9 ("mfd: Modify samsung mfd driver for common api") from the mfd tree and commits 3fe3a182adfe ("regulator: Remove s5m8767a buck initialization"), df2643cfa4ad

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 conflicts in drivers/regulator/s5m8767.c between commit 63063bfbffe9 (mfd: Modify samsung mfd driver for common api) from the mfd tree and commits 3fe3a182adfe (regulator: Remove s5m8767a buck initialization), df2643cfa4ad (regulator:

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