| commit | 29c7f1f53bfb3770bdb65a9e79064a963dd40621 | [log] [tgz] |
|---|---|---|
| author | Linus Walleij <linus.walleij@linaro.org> | Fri May 30 09:52:43 2014 +0200 |
| committer | Linus Walleij <linus.walleij@linaro.org> | Fri May 30 09:52:43 2014 +0200 |
| tree | 69dcf9d002907f0ba9926f8a8aca8bf1869bc33f | |
| parent | 697787a16cae17f96a38e4ec82d9301457ada215 [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>