Merge remote-tracking branch 'regulator/topic/core' into regulator-next
authorMark Brown <broonie@kernel.org>
Fri, 10 Apr 2015 18:15:59 +0000 (19:15 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 10 Apr 2015 18:15:59 +0000 (19:15 +0100)
1  2 
drivers/regulator/core.c
include/linux/regulator/driver.h

Simple merge
Simple merge