]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 02:58:58 +0000 (12:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 02:58:58 +0000 (12:58 +1000)
commit736894ecb33290e37085aa2f5fe0f997967f5161
tree29ed302675a65b7d9c956930d377f8ba62a9fb62
parent3fe5cf5760f780dbdf845a9962ce0390f1c8a544
parent18766f0936d444fd7ff2e0064bd6e69a89d5c6fc
Merge remote-tracking branch 'battery/master'

Conflicts:
include/linux/mfd/88pm860x.h
drivers/mfd/88pm860x-core.c
include/linux/mfd/88pm860x.h