author | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 26 May 2013 03:32:49 +0000 (20:32 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 26 May 2013 03:32:49 +0000 (20:32 -0700) |
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
"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
1 | 2 | |||
---|---|---|---|---|
drivers/power/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/power/pm2301_charger.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/power/Kconfig
Simple merge
diff --cc drivers/power/pm2301_charger.c
Simple merge