Merge tag 'v3.18-rc4' into regulator-max77802
authorMark Brown <broonie@kernel.org>
Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
commitcf2394f70cf7774a107fbaa1ef5010db4bd69baa
treee79e3e479d04213a67ecd47b31c7db648b0313c2
parent45fc84c668ba6cc08cbae74042be838bf9283d98
parent206c5f60a3d902bc4b56dab2de3e88de5eb06108
Merge tag 'v3.18-rc4' into regulator-max77802

Linux 3.18-rc4
drivers/regulator/max77802.c
drivers/regulator/of_regulator.c