From: Mark Brown <broonie@linaro.org>
Date: Wed, 18 Dec 2013 17:24:24 +0000 (+0000)
Subject: Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
X-Git-Tag: v3.14-rc1~92^2^3~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d1c8b1bd093cb57860fb6446e096e1c1cda92d4d;p=linux.git

Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.

regulator/clk: Fix s2mps11 build

This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
---

d1c8b1bd093cb57860fb6446e096e1c1cda92d4d