aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-17 12:57:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-17 12:57:36 -0800
commitb0031f227e47919797dc0e1c1990f3ef151ff0cc (patch)
tree0f1e0957e221d74118388f8346da4f0cf13a92ec /Makefile
parentMerge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentmfd: s2mps11: Fix build after regmap field rename in sec-core.c (diff)
downloadlinux-dev-b0031f227e47919797dc0e1c1990f3ef151ff0cc.tar.xz
linux-dev-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 'Makefile')
0 files changed, 0 insertions, 0 deletions