Merge git://git.infradead.org/users/cbou/battery-2.6.31