diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 13:39:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 13:39:53 +0200 |
| commit | cbcd085da2f99a8b36a07256dd7d1aae38b1d80f (patch) | |
| tree | f6ff7373eba2ae700a49a855707a7c63552190ef /drivers/acpi/battery.c | |
| parent | 9e50bc14a7f58b5d8a55973b2d69355852ae2dae (diff) | |
| parent | 0c5ff0ef80c2561ef20721299ecfc39c5a42f694 (diff) | |
Merge branch 'pm-sleep' into acpi-battery
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions