From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Dec 2013 20:57:36 +0000 (-0800)
Subject: Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b0031f227e47919797dc0e1c1990f3ef151ff0cc;p=deliverable%2Flinux.git

Merge tag 's2mps11-build' of git://git./linux/kernel/git/broonie/regulator

Pull regulator/clk fix from Mark Brown:
 "Fix s2mps11 build

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

* tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  mfd: s2mps11: Fix build after regmap field rename in sec-core.c
---

b0031f227e47919797dc0e1c1990f3ef151ff0cc