Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Feb 2012 22:20:43 +0000 (14:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Feb 2012 22:20:43 +0000 (14:20 -0800)
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"


Trivial merge