diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 14:01:08 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 14:01:08 -0500 |
commit | 979268cd32ddb577fe5bfd90331a1a8b3024de0d (patch) | |
tree | 8c200dd2bd0a76d107d300a44da2828681fe810e /drivers/regulator | |
parent | 12f457dd78900dbdf9431330d0c1abc040e03dbe (diff) | |
parent | 7728c14a785f934ffccc4f45ecd9646fc07ea679 (diff) | |
parent | ba305e31e88ea5c2f598ff9fbc5424711a429e30 (diff) |
Merge remote-tracking branches 'regulator/topic/dt' and 'regulator/for-linus' into regulator-next