From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 May 2013 03:32:49 +0000 (-0700)
Subject: Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6
X-Git-Tag: v3.10-rc3~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=72de4c63e5ebe8e4054ea800d7a8d4b3f033caf2;p=~emulex%2Finfiniband.git

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
---

72de4c63e5ebe8e4054ea800d7a8d4b3f033caf2