Merge remote-tracking branch 'regulator/topic/core' into regulator-next
authorMark Brown <broonie@linaro.org>
Wed, 26 Mar 2014 16:57:44 +0000 (16:57 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 26 Mar 2014 16:57:44 +0000 (16:57 +0000)
1  2 
drivers/regulator/core.c
drivers/regulator/s2mps11.c

Simple merge
Simple merge