Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
authorMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:17:00 +0000 (12:17 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:17:00 +0000 (12:17 +0100)
commitfdaff15ae6cc8745b9b56adab0252729b476ed7e
tree182eb140d5c71501159fb0d46ffc8b74c766dc13
parentd1c3f7ca158e78fa78c9789d836d2a98d5fd25f3
parent9839d627c2a2c74facde9a9ee949f2ba0a1363b1
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers

Conflicts:
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/Kconfig
drivers/regulator/Makefile