From: Linus Torvalds Date: Mon, 13 Feb 2012 22:20:43 +0000 (-0800) Subject: Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery... X-Git-Tag: v3.12-rc1~3864 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b582f393150c72b18339bc00d7ed4fb22445ed1;p=kernel%2Fkernel-generic.git Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent Just a few small fixes for a bunch of drivers. Nothing noteworthy. * tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent: lp8727_charger: Add terminating entry for i2c_device_id table power_supply: Fix modalias for charger-manager lp8727_chager: Fix permissions on a header file bq27x00_battery: Fix flag register read Revert "bq27x00_battery: Fix reporting status value for bq27500 battery" --- 3b582f393150c72b18339bc00d7ed4fb22445ed1