commit | d855c5c909ebec61b5829c1fdb294d9cdd4ede86 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 27 15:03:56 2014 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 27 15:03:56 2014 -0700 |
tree | 4320e474beed71d449a581f42a5038b600e116f1 | |
parent | cac7f2429872d3733dc3f9915857b1691da2eb2f [diff] | |
parent | bc02871b4583ac2fc2567d9d1826b2857cf169ac [diff] |
Merge tag 'regulator-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator Pull regulator fixes from Mark Brown: "A couple of fixes for v3.18, one fix for an incorrect voltage to register mapping in the rk808 driver and a fix for a build failure in some SH defconfigs" * tag 'regulator-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: Include err.h from consumer.h to fix build failure regulator: rk808: Fix min_uV for DCDC1 & DCDC2