diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-11 01:08:35 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-11 01:08:35 +0100 |
| commit | 6a1c64cb401d14babf7df6307fe8ed5b9728df30 (patch) | |
| tree | 77eddb6bc1d5cafdbe7f35caae11ce4fb337b2a8 /drivers/acpi/ec.c | |
| parent | 13de22c59fd1f5a452fea806a5f822883deec88b (diff) | |
| parent | 158204397034f088bfd505eeee281f7072da1c24 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm into pm-apm-next
Pull APM update for 3.14-rc1 from Jiri Kosina.
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
apm-emulation: add hibernation APM events to support suspend2disk
Diffstat (limited to 'drivers/acpi/ec.c')
0 files changed, 0 insertions, 0 deletions