projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 697787a) | patch
pinctrl: sirf: fix a bad conflict resolution
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 30 May 2014 07:52:43 +0000 (09:52 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 30 May 2014 07:52:43 +0000 (09:52 +0200)
commit29c7f1f53bfb3770bdb65a9e79064a963dd40621
tree69dcf9d002907f0ba9926f8a8aca8bf1869bc33ftree | snapshot
parent697787a16cae17f96a38e4ec82d9301457ada215commit | diff
pinctrl: sirf: fix a bad conflict resolution

Commit 294d1351ff47726f0f110b88e816cbafe89512fb
"pinctrl: sirf: switch to using allocated state container"
caused a build conflict due to a bad conflict resolution
when cherry-picking the patch. Fix it up.

Cc: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/sirf/pinctrl-sirf.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.