]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 02:46:14 +0000 (12:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 02:46:14 +0000 (12:46 +1000)
commit82c35e5430be3bb0fe840f338d48292358bee270
tree56771c23335dd96104f20c18f5b5fdb606de08b1
parent9d363b6b9ad4f7de490855645931bb806ed679ae
parent18766f0936d444fd7ff2e0064bd6e69a89d5c6fc
Merge remote-tracking branch 'battery/master'

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