Messages in this thread | | | Date | Wed, 25 Jul 2012 12:10:17 +0530 | From | Laxman Dewangan <> | Subject | Re: linux-next: manual merge of the mfd tree with Linus' tree |
| |
On Wednesday 25 July 2012 06:48 AM, Stephen Rothwell wrote: > * PGP Signed by an unknown key > > Hi Samuel, > > Today's linux-next merge of the mfd tree got a conflict in > arch/arm/configs/tegra_defconfig between commit dbebe1589d3a ("ARM: > tegra: defconfig updates") from Linus' tree and commit 05f3ad2b8ae5 > ("ARM: tegra: defconfig: Enable tps6586x gpio") from the mfd tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Yes, this fix is proper.
Thanks, Laxman
| |