]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 525322b 01bd9b7)
Merge remote-tracking branch 'regulator/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 03:18:40 +0000 (13:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 03:18:40 +0000 (13:18 +1000)
Conflicts:
drivers/regulator/tps65090-regulator.c

1  2 
drivers/regulator/Kconfig patch | diff1 | diff2 | blob | history

diff --cc drivers/regulator/Kconfig
Simple merge
Linux kernel for KaRo TX COM modules