Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 May 2013 03:32:49 +0000 (20:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 May 2013 03:32:49 +0000 (20:32 -0700)
commit72de4c63e5ebe8e4054ea800d7a8d4b3f033caf2
tree64f1700cce49b20155e6bf76dbd79f611d0a06fc
parent1aad08dc571604ebe473e2a187f0f7b211ae6c3f
parentdccab6092d3c25bf943d12fb658e63fd88bf8b4a
Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6

Pull bettery fixes from Anton Vorontsov:
 "Last minute one-liners: wrong kfree usage fix, module alias fixup and
  kconfig adjustments"

* tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6:
  pm2301_charger: Fix module alias prefix
  wm831x_backup: Fix wrong kfree call for devdata->backup.name
  bq27x00: Fix I2C dependency in KConfig
  lp8788-charger: Fix kconfig dependency
drivers/power/Kconfig
drivers/power/pm2301_charger.c