diff options
| author | Linus Torvalds <[email protected]> | 2013-12-17 20:57:36 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-12-17 20:57:36 +0000 |
| commit | b0031f227e47919797dc0e1c1990f3ef151ff0cc (patch) | |
| tree | 0f1e0957e221d74118388f8346da4f0cf13a92ec /net/unix/af_unix.c | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | mfd: s2mps11: Fix build after regmap field rename in sec-core.c (diff) | |
| download | kernel-b0031f227e47919797dc0e1c1990f3ef151ff0cc.tar.gz kernel-b0031f227e47919797dc0e1c1990f3ef151ff0cc.zip | |
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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions