Commits

Merge git://git.infradead.org/users/cbou/battery-2.6.26 * git://git.infradead.org/users/cbou/battery-2.6.26: power_supply: Fix race in power_supply_uevent
Merge git://git.infradead.org/users/cbou/battery-2.6.26 * git://git.infradead.org/users/cbou/battery-2.6.26: power_supply: Fix race in power_supply_uevent