]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 941ef73 1b1ccee)
Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Dec 2013 20:57:36 +0000 (12:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Dec 2013 20:57:36 +0000 (12:57 -0800)
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


Trivial merge
Andy's Linux Kernel repo