diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-03 22:48:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-03 22:48:25 +0100 |
| commit | 9a2f1aad2f5bf005560c334d6f0aebd82726315b (patch) | |
| tree | 20f71f9311db6d8578ab842f7d29b63322ae1f42 /fs/ocfs2/dlm/dlmconvert.c | |
| parent | Merge tag 'pm+acpi-3.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | max17042_battery: Fix build errors caused by missing REGMAP_I2C config (diff) | |
| download | linux-9a2f1aad2f5bf005560c334d6f0aebd82726315b.tar.xz linux-9a2f1aad2f5bf005560c334d6f0aebd82726315b.zip | |
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
Diffstat (limited to 'fs/ocfs2/dlm/dlmconvert.c')
0 files changed, 0 insertions, 0 deletions