Re: linux-next: manual merge of the arm-soc tree with the battery tree

On Tuesday 27 November 2012, Stephen Rothwell wrote: > > -config AB8500_BATTERY_THERM_ON_BATCTRL > -bool "Thermistor connected on BATCTRL ADC" > -depends on AB8500_BM > -help > - Say Y to enable battery temperature measurements using > - thermistor connected on BATCT

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/power/Kconfig between commit bd9e8ab2d58d ("ab8500: Add devicetree support for btemp") from the battery tree and commit 96ff0f5c7efd ("power: Add simple poweroff-gpio driver") from the arm-soc tree. I fixed it up (see