| commit | 9a2f1aad2f5bf005560c334d6f0aebd82726315b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 03 13:48:25 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 03 13:48:25 2014 -0800 |
| tree | 20f71f9311db6d8578ab842f7d29b63322ae1f42 | |
| parent | 23e8e5901d8c644c1d30d69d207d7f3c90e99e8c [diff] | |
| parent | 93353e8088057dd988362e6cae727af43734b494 [diff] |
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