Commits
Merge git://git.infradead.org/users/cbou/battery-2.6.36 * git://git.infradead.org/users/cbou/battery-2.6.36: apm_power: Add missing break statement intel_pmic_battery: Fix battery charging status on mrst
Merge git://git.infradead.org/users/cbou/battery-2.6.36 * git://git.infradead.org/users/cbou/battery-2.6.36: apm_power: Add missing break statement intel_pmic_battery: Fix battery charging status on mrst