projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb0031f227e47919797dc0e1c1990f3ef151ff0cc
tree0f1e0957e221d74118388f8346da4f0cf13a92ectree | snapshot
parent941ef73dbe337623e5eb3fd0a43bc1fc56082bb6commit | diff
parent1b1ccee1e821e59c2a45c95b007aeb2c9dafd9becommit | diff
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
John Crispins staging tree