diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-15 17:36:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-15 17:36:45 -0800 |
| commit | 7051d8e6308640aaee2f9d45d0ceaad3a4ee8a78 (patch) | |
| tree | b3d15e9232ca6956e255c7e1dd7c3276903440f0 /mm/ksm.c | |
| parent | d3255ec483ca048192f6e8a8789e08e32b379b84 (diff) | |
| parent | b81180b3fd4814af0459a5b6aeb1ee188fea98dc (diff) | |
| download | linux-7051d8e6308640aaee2f9d45d0ceaad3a4ee8a78.tar.bz2 | |
Merge tag 'for-v3.19' of git://git.infradead.org/battery-2.6
Pull power supply updates from Sebastian Reichel::
"Power supply and reset changes for the v3.19 series
- update power/reset drivers to use kernel restart handler
- add power off driver for i.mx6
- add DT support for gpio-charger"
* tag 'for-v3.19' of git://git.infradead.org/battery-2.6:
power: reset: adjust priority of simple syscon reboot driver
power: ds2782_battery: Simplify the PM hooks
power/reset: brcmstb: Register with kernel restart handler
power/reset: hisi: Register with kernel restart handler
power/reset: keystone: Register with kernel restart handler
power/reset: axxia: Register with kernel restart handler
power/reset: xgene: Register with kernel restart handler
power/reset: xgene: Use mdelay instead of jiffies based timeout
power/reset: xgene: Use local variable dev instead of pdev->dev
power/reset: xgene: Drop devm_kfree
power/reset: xgene: Return -ENOMEM if out of memory
power/reset: vexpress: Register with kernel restart handler
power: reset: imx-snvs-poweroff: add power off driver for i.mx6
power: gpio-charger: add device tree support
dt-bindings: document gpio-charger bindings
Diffstat (limited to 'mm/ksm.c')
0 files changed, 0 insertions, 0 deletions