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)
1  2 
drivers/regulator/Kconfig
drivers/regulator/Makefile

Simple merge
Simple merge