summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-16 16:05:57 +0100
committerMark Brown <broonie@linaro.org>2014-06-16 16:05:57 +0100
commitc9ac065928d887e26da33a84210a3e3610052d31 (patch)
tree19aa1fed8300181628d8bc1bb88780b8e1ecbe4d /arch/arm/mach-zynq
parentc3313b0ce8e70d6c5e556664090c6ab311cb892a (diff)
parent2050afde19aeae33310bb62641ca52acad215cf8 (diff)
parent73d23ca732edf07ce2b62668821247bf1a636b54 (diff)
parent6b7f2d82d5dc30fd4a31faf44f701b683c28715e (diff)
downloadlinux-c9ac065928d887e26da33a84210a3e3610052d31.tar.bz2
Merge remote-tracking branches 'regulator/fix/as3722', 'regulator/fix/ltc3589' and 'regulator/fix/palmas' into regulator-linus