Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
authorMark Brown <broonie@linaro.org>
Wed, 18 Dec 2013 17:24:24 +0000 (17:24 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 18 Dec 2013 17:24:41 +0000 (17:24 +0000)
commitd1c8b1bd093cb57860fb6446e096e1c1cda92d4d
tree9c93ddf1ced6064a7f75a3f8a3691d09e624edb9
parentd13733f4a24d93c582f22f17b5434cf195b7d505
parent1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be
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.
drivers/regulator/s5m8767.c