| commit | b0031f227e47919797dc0e1c1990f3ef151ff0cc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 17 12:57:36 2013 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 17 12:57:36 2013 -0800 |
| tree | 0f1e0957e221d74118388f8346da4f0cf13a92ec | |
| parent | 941ef73dbe337623e5eb3fd0a43bc1fc56082bb6 [diff] | |
| parent | 1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be [diff] |
Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/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