From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jan 2014 21:48:25 +0000 (-0800)
Subject: Merge tag 'for-v3.13-fixes' of git://git.infradead.org/battery-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9a2f1aad2f5bf005560c334d6f0aebd82726315b;p=deliverable%2Flinux.git

Merge tag 'for-v3.13-fixes' of git://git.infradead.org/battery-2.6

Pull battery fixes from Anton Vorontsov:
 "Two fixes:

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

   - fix kernel oops when booting with wakeup_source_activate enabled"

* tag 'for-v3.13-fixes' of git://git.infradead.org/battery-2.6:
  max17042_battery: Fix build errors caused by missing REGMAP_I2C config
  power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate
---

9a2f1aad2f5bf005560c334d6f0aebd82726315b