]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
projects / can-eth-gw-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c592c76 c1432b1)
Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub'...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 18 Mar 2012 21:38:28 +0000 (21:38 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 18 Mar 2012 21:38:28 +0000 (21:38 +0000)
1  2 
Documentation/driver-model/devres.txt patch | diff1 | diff2 | blob | history
drivers/regulator/core.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/driver-model/devres.txt
Simple merge
diff --cc drivers/regulator/core.c
Simple merge