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

[Arnd Bergmann]

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 BATCTRL ADC.
>  -
> + source "drivers/power/reset/Kconfig"
> + 
>   endif # POWER_SUPPLY
>   
>   source "drivers/power/avs/Kconfig"
> 


Looks good, thanks!

	Arnd