4961ab934a
* git://git.infradead.org/battery-2.6: power_supply: Fix regression for 'type' property
* git://git.infradead.org/battery-2.6: power_supply: Fix regression for 'type' property