Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery...