summaryrefslogtreecommitdiff
path: root/kernel/reboot.c
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 /kernel/reboot.c
parent941ef73dbe337623e5eb3fd0a43bc1fc56082bb6 (diff)
parent1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (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
Diffstat (limited to 'kernel/reboot.c')
0 files changed, 0 insertions, 0 deletions