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

From: Stephen Rothwell
Date: Fri Sep 26 2014 - 06:30:29 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/power/Kconfig between commit 6a91e854442c ("power: max14577:
Fix circular config SYSFS dependency") from the battery tree and commit
821246576e03 ("drivers/power/Kconfig: revert part of "charger:
max14577: Add support for MAX77836 charger"") from the akpm tree.

I dropped the akpm tree patch as the battery tree patch fixes the same

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature