Re: [PATCH] pinctrl: msm: fix up out-of-order merge conflict

2014-03-14 Thread Bjorn Andersson
On Thu, Mar 13, 2014 at 11:57 PM, Linus Walleij wrote: > Commit 051a58b4622f0e1b732acb750097c64bc00ddb93 > "pinctrl: msm: Simplify msm_config_reg() and callers" > removed the local "reg" variable in the msm_config_reg() > function, but the earlier > commit ed118a5fd951bd2def8249ee251842c4f81fe4bd

[PATCH] pinctrl: msm: fix up out-of-order merge conflict

2014-03-14 Thread Linus Walleij
Commit 051a58b4622f0e1b732acb750097c64bc00ddb93 "pinctrl: msm: Simplify msm_config_reg() and callers" removed the local "reg" variable in the msm_config_reg() function, but the earlier commit ed118a5fd951bd2def8249ee251842c4f81fe4bd "pinctrl-msm: Support output-{high,low} configuration" introduced

[PATCH] pinctrl: msm: fix up out-of-order merge conflict

2014-03-14 Thread Linus Walleij
Commit 051a58b4622f0e1b732acb750097c64bc00ddb93 pinctrl: msm: Simplify msm_config_reg() and callers removed the local reg variable in the msm_config_reg() function, but the earlier commit ed118a5fd951bd2def8249ee251842c4f81fe4bd pinctrl-msm: Support output-{high,low} configuration introduced a new

Re: [PATCH] pinctrl: msm: fix up out-of-order merge conflict

2014-03-14 Thread Bjorn Andersson
On Thu, Mar 13, 2014 at 11:57 PM, Linus Walleij linus.wall...@linaro.org wrote: Commit 051a58b4622f0e1b732acb750097c64bc00ddb93 pinctrl: msm: Simplify msm_config_reg() and callers removed the local reg variable in the msm_config_reg() function, but the earlier commit