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