[GIT PULL] battery-2.6.git

From: Anton Vorontsov
Date: Fri Jan 03 2014 - 04:33:49 EST


Hello Linus,

Please pull battery-2.6 git tree to receive two fixes prepared for the
v3.13 release:

- Fix build error caused by max17042_battery conversion to the regmap API.

- Fix kernel oops when booting with wakeup_source_activate enabled.

Thank you!

Anton


The following changes since commit dc1ccc48159d63eca5089e507c82c7d22ef60839:

Linux 3.13-rc2 (2013-11-29 12:57:14 -0800)

are available in the git repository at:

git://git.infradead.org/battery-2.6.git tags/for-v3.13-fixes

for you to fetch changes up to 93353e8088057dd988362e6cae727af43734b494:

max17042_battery: Fix build errors caused by missing REGMAP_I2C config (2013-12-01 14:25:03 -0800)

----------------------------------------------------------------
Austin Boyle (1):
max17042_battery: Fix build errors caused by missing REGMAP_I2C config

Shuah Khan (1):
power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate

drivers/power/Kconfig | 1 +
drivers/power/power_supply_core.c | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/