]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Apr 2013 17:47:14 +0000 (18:47 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Apr 2013 17:47:14 +0000 (18:47 +0100)
1  2 
drivers/regulator/core.c
include/linux/regulator/driver.h

Simple merge
Simple merge