]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers
authorMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:14:26 +0000 (12:14 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:14:26 +0000 (12:14 +0100)
commitd1c3f7ca158e78fa78c9789d836d2a98d5fd25f3
tree30f11b3581cdab9f344bd6718a73988e7fc6a59c
parent6a642509801116037720892efe72f0e84f02f317
parentfbf7974427910a3f13fcb76a3493f9da0b141120
Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers

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