From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 30 May 2014 07:52:43 +0000 (+0200)
Subject: pinctrl: sirf: fix a bad conflict resolution
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~31^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29c7f1f53bfb3770bdb65a9e79064a963dd40621;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed