Merge branch 'regulator-drivers' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 22 Jul 2012 18:32:00 +0000 (19:32 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 22 Jul 2012 18:32:00 +0000 (19:32 +0100)
commit3384fb98845dc014770caa224d61a2effd258ca5
tree8189134a4938632e2d06e93af04c9fc1f3c2d4c9
parent8cfc545e0e3e6cc82acfdc79321b41eeeab0ca45
parentade7515fefad9af13f6dd469f35bb413b6a5b473
Merge branch 'regulator-drivers' into regulator-next
drivers/regulator/core.c
include/linux/regulator/driver.h
include/linux/regulator/fixed.h