]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regulator/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 03:50:24 +0000 (13:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 03:50:24 +0000 (13:50 +1000)
commitaecccb8c1beda907e5a44a7b4a4eb5fbd7320b6d
tree828418e407906be2e60cc11e0544bd502c36bdc8
parent385ec2d8516fdcef687d2144ee80df3eb5149b12
parent6e7f5113e138955ffb7dd00af0acae7fb6c95842
Merge remote-tracking branch 'regulator/for-next'

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