Re: linux-next: manual merge of the gpio tree with the regulatortree

From: Laxman Dewangan
Date: Thu Feb 02 2012 - 23:47:19 EST

On Friday 03 February 2012 08:14 AM, Stephen Rothwell wrote:
* PGP Signed by an unknown key

Hi Grant,

Today's linux-next merge of the gpio tree got a conflict in
include/linux/mfd/tps65910.h between commit 1e0c66f49762 ("regulator:
tps65910: Sleep control through external inputs") from the regulator tree
and commit 290705988073 ("gpio: tps65910: Add sleep control support")
from the gpio tree.

Just context changes. I fixed it up (see below) and can carry the fix as
Yes, merge is fine.. Thanks for taking care of conflicts.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at