linux-next: manual merge of the battery tree with Linus' tree

Hi Anton, Today's linux-next merge of the battery tree got a conflict in include/linux/mfd/abx500/ab8500-bm.h between commit 00441b5e6b98 ("mfd: Fix compile errors and warnings when !CONFIG_AB8500_BM") from Linus' tree and commit 3988a4df3499 ("ab8500_bm: Skip first CCEOC irq for instant

linux-next: manual merge of the battery tree with Linus' tree

Hi Anton, Today's linux-next merge of the battery tree got a conflict in include/linux/mfd/abx500/ab8500-bm.h between commit 00441b5e6b98 (mfd: Fix compile errors and warnings when !CONFIG_AB8500_BM) from Linus' tree and commit 3988a4df3499 (ab8500_bm: Skip first CCEOC irq for instant current)

linux-next: manual merge of the battery tree with the tree

Hi Anton, Today's linux-next merge of the battery tree got a conflict in include/linux/mfd/88pm860x.h between commit 2e57d56747e6 ("mfd: 88pm860x: Device tree support") from the mfd tree and commit a830d28b48bf ("power_supply: Enable battery-charger for 88pm860x") from the battery tree. I fixed

linux-next: manual merge of the battery tree with the tree

Hi Anton, Today's linux-next merge of the battery tree got a conflict in include/linux/mfd/88pm860x.h between commit 2e57d56747e6 (mfd: 88pm860x: Device tree support) from the mfd tree and commit a830d28b48bf (power_supply: Enable battery-charger for 88pm860x) from the battery tree. I fixed it