Merge remote-tracking branch 'regulator/topic/stw481x' into regulator-next
authorMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:11:40 +0000 (11:11 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:11:40 +0000 (11:11 +0100)
commitaa11a358f88b371dee64a556eb7acc9ea05b0102
tree439035bd5fd20b04b3a2ac0200afd3f0319d42d2
parent67471b6a242b182dd44afbd3848fcfe4065c6445
parent18dca93eb7faa8d90fbc54bfb08560caebbf92cd
Merge remote-tracking branch 'regulator/topic/stw481x' into regulator-next
drivers/regulator/Kconfig
drivers/regulator/Makefile