]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit6306d1eed0c594775ef03f96bf9e4fcd06f9b812
treeb94749b7be3e5a7c6e947da7a7f068c99e662f08
parent525322b21079c0cc3503a63030f4b76140e783f2
parent01bd9b79cbec30f87c411fc07f4c4019c82f29cc
Merge remote-tracking branch 'regulator/for-next'

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