aboutsummaryrefslogtreecommitdiff
path: root/samples/kobject
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-05-30 09:52:43 +0200
committerLinus Walleij <linus.walleij@linaro.org>2014-05-30 09:52:43 +0200
commit29c7f1f53bfb3770bdb65a9e79064a963dd40621 (patch)
tree69dcf9d002907f0ba9926f8a8aca8bf1869bc33f /samples/kobject
parent697787a16cae17f96a38e4ec82d9301457ada215 (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>
Diffstat (limited to 'samples/kobject')
0 files changed, 0 insertions, 0 deletions