Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub...
authorMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:14:43 +0000 (11:14 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:14:43 +0000 (11:14 +0000)
commit176488fbc121a4670849f2d10332b0fac333886b
tree95cc70519f1f3f28eb46f86e5d24b971c150c328
parent1b56ffda75ba1400134d9250e8aa0de53ede3629
parentf291c74a32509d31731bb82cbb26c64cd430805b
parent70b946f9acf4e805361bd877a7e25cc05e497c52
Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub' into regulator-next
drivers/regulator/Kconfig
include/linux/regulator/consumer.h