Messages in this thread | | | Date | Mon, 26 Nov 2012 12:17:21 +0530 | From | Laxman Dewangan <> | Subject | 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 tree and commit > 24282a1ca33b ("regulator: tps65090: Register all regulators in single > probe call") from the regulator tree. > > I fixed it up (I think - see below) and can carry the fix as necessary (no action > is required). >
The merges looks fine.
| |