]> www.infradead.org Git - users/hch/uuid.git/commitdiff
projects / users / hch / uuid.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6979380 9efdd27)
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
authorMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
1  2 
drivers/regulator/core.c patch | diff1 | diff2 | blob | history
include/linux/regulator/consumer.h patch | diff1 | diff2 | blob | history

diff --cc drivers/regulator/core.c
Simple merge
diff --cc include/linux/regulator/consumer.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.