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)
1  2  3 
drivers/regulator/Kconfig
include/linux/regulator/consumer.h

Simple merge
Simple merge