]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regulator/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 03:26:08 +0000 (13:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 03:26:08 +0000 (13:26 +1000)
commit1c684f7cd85df8f374cbcccf32f1058aafeca48a
tree41c4a7d5270b63ab162d61842e88279fe20d133a
parent075a7399881d9b1b360c2338be50b9daa6994991
parente9bf70c21cc549b7d6b15807180b10eb0e5e1ac5
Merge remote-tracking branch 'regulator/for-next'

Conflicts:
drivers/regulator/tps65090-regulator.c
drivers/regulator/Kconfig